Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java

@@ -7,6 +7,7 @@ import com.adc.da.slrs.processModel.entity.exportExcel;
 import com.adc.da.slrs.processModel.entity.importExcelDTO;
 import com.adc.da.slrs.processModel.service.impl.IExportServiceImpl;
 import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.exception.AdcDaBaseException;
 import com.adc.da.util.http.ResponseMessage;
@@ -72,14 +73,16 @@ public class exportWkExcel {
      * 静态加载企标类别下拉框
      * @return
      */
-    private static Map<String,Object> getBussStandTypeData(){
+    private Map<String,Object> getBussStandTypeData(){
         Map<String,Object> resultMap = new HashMap<>();
         List<Map<String,String>> bussStandTypeList = new ArrayList<>();
-        char letter = 'A';
+        List<String> dicTypeNameList = new ArrayList<>();
-        for(letter = 'A'; letter <= 'Z'; ++letter){
+        String dicId = "NGETEMDJDI";
+        dicTypeNameList = dicTypeEOService.selectByDicId(dicId);
+        for (String dicTypeName : dicTypeNameList){
             Map<String,String> typeMap = new HashMap<>();
-            typeMap.put("label","Q/FT "+letter);
+            typeMap.put("label",dicTypeName);
-            typeMap.put("value","Q/FT "+letter);
+            typeMap.put("value",dicTypeName);
             bussStandTypeList.add(typeMap);
         }
         resultMap.put("BUSSSTANDCLASS",bussStandTypeList);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -130,5 +130,6 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
     @Select("select * from sar")
     String setDtqbbhbuss(String dtqbbhbuss);
 
+    String selectByStandCode(String standCode);
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -2834,13 +2834,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         sarBussionessStand.setStandCode(standCode);
         // 根据标准号判断数据是否已存在
         //2021年4月9日 此处检查当前是否存在standId
+        String id = sarBussionessStandEODao.selectByStandCode(sarBussionessStand.getStandCode());
         QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
                 .eq(standName != null,"STAND_NAME",standName);
         List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
         Integer valIdFlag = 0;
         for (SarBussionessStand stand :list){
-            if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+            if ((list.size() >=1 && stand.getId().equals(id))){
                 valIdFlag = stand.getValidFlag();
                 if (valIdFlag == 0){
                     logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
@@ -4648,6 +4649,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 //            writeWarnings(sarBussionessStandEO);
             // 处理属性表信息
             if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) {
+                if(sarBussionessStandEO!=null && StringUtils.isNotBlank(sarBussionessStandEO.getIssueTime()) && StringUtils.isNotBlank(sarBussionessStandEO.getStandSort())){
+                    if(sarBussionessStandEO.getStandSort().equals("Q/QCBFC") || sarBussionessStandEO.getStandSort().equals("Q/FT X") || sarBussionessStandEO.getStandSort().equals("Q/FTX")){
+                        //产品标准三年复审
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        try {
+                            Date parse = sdf.parse(sarBussionessStandEO.getIssueTime());
+                            Calendar instance = Calendar.getInstance();
+                            instance.setTime(parse);
+                            instance.add(Calendar.YEAR,3);
+                            //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
+                            String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
+                            if(StringUtils.isNotBlank(sarStandAttrEOStr)){
+                                Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
+                                sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
+                                sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
+                            }
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }else {
+                        //技术标准五年复审
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        try {
+                            Date parse = sdf.parse(sarBussionessStandEO.getIssueTime());
+                            Calendar instance = Calendar.getInstance();
+                            instance.setTime(parse);
+                            instance.add(Calendar.YEAR,5);
+                            //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
+                            String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
+                            if(StringUtils.isNotBlank(sarStandAttrEOStr)){
+                                Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
+                                sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
+                                sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
+                            }
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
                 createStandAttrInfo(sarBussionessStandEO,false);
             }
             // 增加关联事件

adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java

@@ -5,6 +5,7 @@ import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
 import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
 import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -1250,6 +1250,10 @@
         and smenu.MENU_ID = '44'
     </select>
 
+    <select id="selectByStandCode" resultType="java.lang.String">
+        select id from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1
+    </select>
+
     <update id="updateByIdInfo" >
         update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}
         where id = #{attfId}

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java

@@ -92,4 +92,6 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
     List<DicTypeEO> selectPidByCode(@Param("fileType") String fileType);
 
     List<DicTypeEO> selectDic(String id);
+
+    List<String> selectByDicId(@Param("dicId") String dicId);
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java

@@ -88,4 +88,5 @@ public interface IDicTypeEOService extends IService<DicTypeEO> {
 
     public List<Map<String,String>> getDicTypeByParentCodes(String dicTypeCode);
 
+    List<String> selectByDicId(String dicId);
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java

@@ -278,6 +278,11 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
         return listMap;
     }
 
+    @Override
+    public List<String>  selectByDicId(String dicId) {
+        return dicTypeEODao.selectByDicId(dicId);
+    }
+
     /**
      * @Author liwenxuan
      * @Description 用来企业大类判断新增是否重复

adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml

@@ -649,4 +649,8 @@
         WHERE
             DIC_ID = #{id}
     </select>
+
+    <select id="selectByDicId" resultType="java.lang.String">
+        select DIC_TYPE_NAME from ts_dictype where dic_id = #{dicId}
+    </select>
 </mapper>