Merge branch 'develop_3' into 'develop_master'

当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单

See merge request LiuChao/foton-slrs-system-rest!247

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java

@@ -2,9 +2,14 @@ package com.adc.da.slrs.sarStandWarning.dao;
 
 
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 
 public interface EarlyWarningEODao extends BaseMapper<EarlyWarningEO> {
 
+    IPage<EarlyWarningEO> selectWarningPage(IPage<EarlyWarningEO> page, @Param(Constants.WRAPPER) QueryWrapper<EarlyWarningEO> queryWrapper);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -72,5 +72,15 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField("POWER")
     private String power;
 
+    @TableField(exist = false)
+    private String issueTime;
 
+    @TableField(exist = false)
+    private String SSRQ;
+
+    @TableField(exist = false)
+    private String XCXSSRQ;
+
+    @TableField(exist = false)
+    private String ZCCSSRQ;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -53,6 +53,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
 import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
 import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao;
@@ -539,16 +542,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return resultMap;
     }
 
-
+    @Autowired
+    private SarFileSplitInfoEODao sarFileSplitInfoEODao;
 
     public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
         for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();
             if (getAttrMap != null && getAttrMap.size() > 0) {
-                //存在的分解单文本名称列表
+                //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单
-                LinkedList<String> itemExistList = new LinkedList<>();
+                SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage();
+                sarFileSplitInfoEOPage.setStandId(row.getId());
+                List<SarFileSplitInfoEO> sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage);
+                List<String> itemExistList = sarFileSplitInfoEOS.stream()
+                        .map(item -> item.getFileType())
+                        .collect(Collectors.toList());
                 getAttrMap.put("itemExistList",itemExistList);
+
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
                     String name = entry.getKey();
                     String value = "";
@@ -557,15 +567,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         if (StringUtils.isNotBlank(value)) {
                             List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
                             entry.setValue(fileObj);
-                            //以标准id和文本类型查询分解单表 有数据设标记为为 1
-                            FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO();
-                            sarItemCount.setStandId(row.getId());
-                            sarItemCount.setFileType(name);
-                            Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount);
-                            if (sarItemsCount>0){
-                                //存在分解单的文本名称存入列表
-                                itemExistList.add(name);
-                            }
                         }
                     }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
                         value = entry.getValue().toString();

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -375,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             sarFileSplitItemsValEODao.insertForeach(itemValList);
 
 
-            //用来往标准分解单插入数据
+//            2021/11/23改用标准详情手动插入
-            messageList.forEach(item -> {
+//            //用来往标准分解单插入数据
-                //new一个对象
+//            messageList.forEach(item -> {
-                SarStandItems standItems1 = new SarStandItems();
+//                //new一个对象
-                //standItems1里的这个值为messageList里的ItermsConditions
+//                SarStandItems standItems1 = new SarStandItems();
-                standItems1.setId(UUIDUtils.randomUUID20())
+//                //standItems1里的这个值为messageList里的ItermsConditions
-                        .setFileType(sarFileSplitInfoEO.getFileType())
+//                standItems1.setId(UUIDUtils.randomUUID20())
-                        .setStandId(sarFileSplitInfoEO.getStandId())
+//                        .setFileType(sarFileSplitInfoEO.getFileType())
-                        .setItemsNum(item.getItemsNum())
+//                        .setStandId(sarFileSplitInfoEO.getStandId())
-                        .setItemsName(item.getItemsName())
+//                        .setItemsNum(item.getItemsNum())
-                        .setTermsConditions(item.getItermsConditions())
+//                        .setItemsName(item.getItemsName())
-                        .setEditFlag(item.getEditFlag());
+//                        .setTermsConditions(item.getItermsConditions())
-
+//                        .setEditFlag(item.getEditFlag());
-                standList.add(standItems1);
+//
-            });
+//                standList.add(standItems1);
-            sarFileSplitItemsEODao.insertStandSplitForeach(standList);
+//            });
+//            sarFileSplitItemsEODao.insertStandSplitForeach(standList);
 
 
         } else {

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao">
+
+    <!-- Result Map-->
+    <resultMap id="resultMap" type="com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO" >
+        <id column="id" property="id" />
+        <result column="STAND_ID" property="standId" />
+        <result column="STAND_NAME" property="standName" />
+        <result column="STAND_TYPE" property="standType"/>
+        <result column="STAND_CODE" property="standCode"/>
+        <result column="XCXSSRQ" property="XCXSSRQ"/>
+        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="SSRQ"  property="SSRQ"/>
+        <result column="PUT_TIME" property="putTime" />
+        <result column="APPLY_TYPE" property="applyType" />
+        <result column="ITEMS_ID" property="itemsId" />
+        <result column="ITEMS_NUM" property="itemsNum" />
+        <result column="ITEMS_NAME" property="itemsName" />
+        <result column="POLICY_ID" property="policyId" />
+        <result column="POLICY_NAME" property="policyName" />
+        <result column="DUTY_ENGINEER" property="dutyEngineer" />
+        <result column="DUTY_ENGINEER" property="dutyEngineer" />
+        <result column="DUTY_ENGINEER" property="dutyEngineer" />
+        <result column="issue_time" property="issueTime" />
+
+
+    </resultMap>
+
+
+
+
+</mapper>