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 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 @@ -211,6 +211,7 @@ claim_type, bus_stand_cover, file_type, + work_flow_show, responsible_unit @@ -233,12 +234,13 @@ #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, - #{editFlag,jdbcType=VARCHAR} + #{editFlag,jdbcType=VARCHAR}, #{fo, jdbcType=VARCHAR}, #{dutyEngineer, jdbcType=VARCHAR}, #{claimType, jdbcType=VARCHAR}, #{busStandCover, jdbcType=VARCHAR}, #{fileType, jdbcType=VARCHAR}, + #{workFlowShow, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR} @@ -350,6 +352,9 @@ responsible_unit = #{responsibleUnit}, + + work_flow_show = #{workFlowShow}, + where id = #{id}