From 052b083ebb663aa5c62e73814f3da5f6a935badf Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 2 Jun 2023 17:19:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E5=AF=B9=E8=AF=84=E5=88=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..9d33d1a9 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 @@ -567,7 +567,7 @@ public class ActSarItemsBussEOService { if (qualityEvaluation.getProcessNode().equals("重新技术委员会评审、评审意见修改")){ //qualityEvaluationService.saveBatch(evaluations); qualityEvaluationService.save(qualityEvaluation); - qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId()); + qualityEvaluationDao.updateByProcessNode(qualityEvaluation.getLawId()); }else { //qualityEvaluationService.saveBatch(evaluations); qualityEvaluationService.save(qualityEvaluation); From d5c3ea25a7c36ffdca4c978d21d29fd533b878ee Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 5 Jun 2023 10:13:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E5=AF=B9=E8=AF=84=E5=88=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/service/ActSarItemsBussEOService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 9d33d1a9..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(qualityEvaluation.getLawId()); - }else { - //qualityEvaluationService.saveBatch(evaluations); - qualityEvaluationService.save(qualityEvaluation); } } } From 9271f5aa81b14a3dd82a882253b5006e437a4e1a Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 6 Jun 2023 09:55:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E5=A5=BD?= =?UTF-8?q?=E4=BD=BF=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarBussionessStandState/sync/StateSync.java | 4 ++++ 1 file changed, 4 insertions(+) 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("下午的工作时间开始了，加油！"); + } } From b7f7e952f29acd12f454942ccf21bd59ebedf5d5 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 6 Jun 2023 11:33:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java | 2 ++ .../service/ISarBussStandSnService.java | 1 + .../service/impl/SarBussStandSnServiceImpl.java | 5 +++++ .../sarBussionessStand/dao/SarBussionessStandDao.java | 2 ++ .../service/ISarBussionessStandService.java | 2 ++ .../service/impl/SarBussionessStandServiceImpl.java | 11 +++++++++-- .../mapper/sarBussStandSn/SarBussStandSnMapper.xml | 3 +++ .../sarBussionessStand/SarBussionessStandMapper.xml | 3 +++ 8 files changed, 27 insertions(+), 2 deletions(-) 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..717bd587 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 @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SarBussStandSnDao extends BaseMapper { String selectMaxStandnSn(); + + String selectMaxStandSn(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..237e6461 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,5 @@ public interface ISarBussStandSnService extends IService { String selectMaxStandnSn(); + String selectMaxStandSn(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..39f9b3a3 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,9 @@ 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..b33089b6 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 @@ -223,8 +223,10 @@ 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); @@ -261,7 +263,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); 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..fd7c7529 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,8 @@ + 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..80eaffcd 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 @@ -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} From be1fc9a7b2c2e81e5814ab545e38a47928b042ba Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 6 Jun 2023 15:51:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarBussStandSn/dao/SarBussStandSnDao.java | 3 +++ .../service/ISarBussStandSnService.java | 2 ++ .../service/impl/SarBussStandSnServiceImpl.java | 5 +++++ .../service/impl/SarBussionessStandServiceImpl.java | 12 +++++++++--- .../mapper/sarBussStandSn/SarBussStandSnMapper.xml | 3 +++ .../sarBussionessStand/SarBussionessStandMapper.xml | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) 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 717bd587..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; /** *

@@ -16,4 +17,6 @@ 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 237e6461..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 @@ -20,4 +20,6 @@ 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 39f9b3a3..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 @@ -70,4 +70,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl select Max(STAND_SN) from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0' + 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 80eaffcd..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 @@