diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 2c6a0f40..626aff2c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -563,14 +563,11 @@ public class ActSarItemsBussEOService { }); } }); + qualityEvaluationService.saveBatch(evaluations); + //当新增完成之后进行循环校验查出流程是重新技术委员会评审、评审意见修改就根据标准id将技术委员会评审、评审意见修改的评分赋值为0 for (QualityEvaluation qualityEvaluation :evaluations){ if (qualityEvaluation.getProcessNode().equals("重新技术委员会评审、评审意见修改")){ - //qualityEvaluationService.saveBatch(evaluations); - qualityEvaluationService.save(qualityEvaluation); - qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId()); - }else { - //qualityEvaluationService.saveBatch(evaluations); - qualityEvaluationService.save(qualityEvaluation); + qualityEvaluationDao.updateByProcessNode(qualityEvaluation.getLawId()); } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java index aaa86294..15c0c482 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarBussStandSn.dao; import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; /** *

@@ -14,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SarBussStandSnDao extends BaseMapper { String selectMaxStandnSn(); + + String selectMaxStandSn(String standSort); + + String selectStandSort(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java index c61e0c37..462326bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java @@ -19,4 +19,7 @@ public interface ISarBussStandSnService extends IService { String selectMaxStandnSn(); + String selectMaxStandSn(String standSort); + + String selectStandSort(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java index f55ac7c4..c3984c0b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java @@ -65,4 +65,14 @@ public class SarBussStandSnServiceImpl extends ServiceImpl { @Select("select * from sar_bussioness_stand where TEXT_STATUS_BUSS is not null") List selectAllStandStatus(); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 98dcdb08..cb89c2ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -70,5 +70,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage cleaningDataReview(); ResponseMessage repeal(String id, String type); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 8442b060..2f967a0c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -220,11 +220,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ + if(count > 0 && MaxSn.equals(standMaxSn)){ QueryWrapper qw = new QueryWrapper(); qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ","")); qw.eq("TASK_ID",taskId); @@ -248,24 +251,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java index 854c2989..360b982f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java @@ -382,4 +382,8 @@ public class StateSync { } } } + @Scheduled(cron = "0 30 13 * * ?") + public void shangBan(){ + logger.info("下午的工作时间开始了,加油!"); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml index 8018e2e0..6bedd77a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml @@ -5,5 +5,11 @@ + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 5f2e9f67..64b18639 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -351,7 +351,7 @@ @@ -1257,6 +1257,9 @@ resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand"> select * from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1 + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}