解读合并之后数据消失bug修复 以及会后流程自动发起 恢复到每天十点

adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java

@@ -186,8 +186,8 @@ public class ProcessTimer {
         }
     }
 
-//    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
+    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
-    @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行
+//    @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行
 //    @Scheduled(cron = "*/40 * * * * ? ")//20s
     public void everyDayTenOlockScanSAM() {
         List<BusProcessNew> busProcessNews=new ArrayList<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java

@@ -3,6 +3,8 @@ package com.adc.da.slrs.standardSplit.entity;
 import com.adc.da.base.entity.BaseEntity;
 import com.adc.da.common.UploadFileInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
 

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

@@ -384,6 +384,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID()));
+        sarFileSplitItemsEO.setWorkFlowShow(sarFileSplitItemsEO.getWorkFlowShow());
         result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
 
         // SAR_FILE_ITEMS_VAL   添加数据，

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml

@@ -68,7 +68,7 @@
      SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type,
      SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit,
      TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as
-     dutyEngineerShow,tsFo.NAME as foShow
+     dutyEngineerShow,tsFo.NAME as foShow,SAR_FILE_SPLIT_ITEMS.work_flow_show AS workFlowShow
   </sql>
 
   <sql id="Base_Column_List2" >
@@ -211,6 +211,7 @@
                 <if test="claimType != null" >claim_type,</if>
                 <if test="busStandCover != null">bus_stand_cover,</if>
                 <if test="fileType != null">file_type,</if>
+                <if test="workFlowShow != null">work_flow_show,</if>
                 <if test="responsibleUnit != null">responsible_unit</if>
             </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -233,12 +234,13 @@
                 <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
-                <if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR}</if>
+                <if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR},</if>
                 <if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
                 <if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
                 <if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>
                 <if test="busStandCover != null" >#{busStandCover, jdbcType=VARCHAR},</if>
                 <if test="fileType != null" >#{fileType, jdbcType=VARCHAR},</if>
+                <if test="workFlowShow != null" >#{workFlowShow, jdbcType=VARCHAR},</if>
                 <if test="responsibleUnit != null" >#{responsibleUnit, jdbcType=VARCHAR}</if>
             </trim>
   </insert>
@@ -350,6 +352,9 @@
         <if test="responsibleUnit != null" >
             responsible_unit = #{responsibleUnit},
         </if>
+        <if test="workFlowShow != null" >
+            work_flow_show = #{workFlowShow},
+        </if>
     </set>
      where id = #{id}
   </update>