Merge remote-tracking branch 'origin/develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -135,6 +135,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
                 }else if("3".equals(esRevisePlan.getReviseStatus())){
                     upd.setPlanStatus("3");
                 }
+            }else if ("4".equals(esRevisePlan.getPlanStatus())){
+                upd.setPlanStatus("4");
             }
             esRevisePlanDao.updateById(upd);
         }

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

@@ -283,6 +283,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         sarBussionessStandEO.setId(UUIDUtils.randomUUID20());
         // 企标新增默认为发布状态
         sarBussionessStandEO.setTextStatusBuss("6jnqba2mby");
+        if (StringUtils.isEmpty(sarBussionessStandEO.getMenuId())){
+            sarBussionessStandEO.setMenuId("3");
+        }
         //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
         if (StringUtils.isNotEmpty(sarBussionessStandEO.getMenuId())) {
             SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -13,6 +13,8 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.utils.util.InitStandAttrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,6 +49,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     private ISarStandardsInfoService sarStandardsInfoService;
     @Autowired
     private SarStandItemsDao sarStandItemsDao;
+    @Autowired
+    private IDicTypeEOService iDicTypeEOService;
 
     public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
         List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
@@ -282,6 +286,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         page.getPager().setRowCount(count);
         List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
         sarStandItems.forEach(sarStandItems1 -> sarStandItems1.setTermsConditions(StringUtils.replace(sarStandItems1.getTermsConditions(),"''","'")));
+        List<DicTypeEO> dicTypeEOList = iDicTypeEOService.getTypeIdByDicIdAndTypeName("VBMNNTHJG", null, null, null);
+        Map<String,String> dicTypeMap = dicTypeEOList.stream().collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName));
+        for (SarStandItems sarStandItems1 : sarStandItems){
+            String srcx = sarStandItems1.getApplyArctic();
+            List<String> srcxList = new ArrayList<>();
+            if (!srcx.contains("[")){
+                String[] srcxArray = srcx.split(",");
+                for (String srcxString : srcxArray){
+                    String ss = dicTypeMap.get(srcxString);
+                    if (null != ss) {
+                        srcxList.add(ss);
+                    }
+                }
+            }
+            if (!CollectionUtils.isEmpty(srcxList)){
+                sarStandItems1.setApplyArctic(String.join(",",srcxList));
+            }
+        }
         return sarStandItems;
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java

@@ -114,7 +114,13 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     @Override
     public IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage) {
         IPage<StandWarningEO> iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize());
-        return earlyWarningEODao.selectWarningPage(iPage,queryPage);
+        IPage<StandWarningEO> standWarningEOIPage = earlyWarningEODao.selectWarningPage(iPage,queryPage);
+        for (StandWarningEO standWarningEO : standWarningEOIPage.getRecords()) {
+            if (null != standWarningEO.getApplyType()) {
+                standWarningEO.setApplyType(standWarningEO.getApplyType().replace("[", "").replace("]", "").replace("\"", ""));
+            }
+        }
+        return standWarningEOIPage;
     }
 
     /**

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -90,6 +90,7 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String orderByA = "";
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "";
+    private String syzd = "";
 
     // syncParam == sync
     private String syncParam;

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1121,6 +1121,9 @@
             <if test="page.applyArctic != null and page.applyArctic != ''">
                 and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
             </if>
+            <if test="page.syzd != null and page.syzd != ''">
+                and SAR_STAND_ATTR_INFO.SYRZ = #{page.syzd}
+            </if>
             <if test="null != page.advanceSearchStr  and page.advanceSearchStr != ''">
                 and (${page.advanceSearchStr})
             </if>
@@ -1510,6 +1513,9 @@
         select count(1) from (select count(*) from SAR_STANDARDS_INFO
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         <include refid="SarStandardsInfo_in_left_wk"/>
+        <if test="syzd != null and syzd != ''">
+            and SAR_STAND_ATTR_INFO.SYRZ = #{syzd}
+        </if>
         GROUP BY SAR_STANDARDS_INFO.id) a
     </select>