From 97519f1813e45ca6313db1964ed1886540b4017c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 12 Jan 2022 15:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=90=88=E5=B9=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=95=B0=E6=8D=AE=E6=B6=88=E5=A4=B1bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E4=BB=A5=E5=8F=8A=E4=BC=9A=E5=90=8E=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=20=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B0=E6=AF=8F=E5=A4=A9=E5=8D=81=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/Timer/ProcessTimer.java     | 4 ++--
 .../standardSplit/entity/SarFileSplitItemsValEO.java     | 2 ++
 .../service/impl/SarFileSplitMenuEOServiceImpl.java      | 1 +
 .../mapper/standardSplit/SarFileSplitItemsEOMapper.xml   | 9 +++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java
index 428670ac..398b9319 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java
+++ b/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 0/1 * * ? ")//每天十点执行
+    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
+//    @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行
 //    @Scheduled(cron = "*/40 * * * * ? ")//20s
     public void everyDayTenOlockScanSAM() {
         List<BusProcessNew> busProcessNews=new ArrayList<>();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java
index 3825e89e..d2951f2a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java
+++ b/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;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
index fec300f5..01f0771e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/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   添加数据，
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
index b63aa9be..a24f29f9 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
+++ b/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>