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 18873758..150b46a8 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 @@ -26,6 +26,7 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.slrs.sarLawsAttrInfo.service.ISarLawsAttrInfoService; @@ -112,6 +113,9 @@ public class ActSarItemsBussEOService { @Autowired private SarBussionessStandDao sarBussionessStandEODao; + @Autowired + private QualityEvaluationDao qualityEvaluationDao; + public void processCreateFsBuss(String standJson) throws Exception { Map standMap = new HashMap(); @@ -559,7 +563,12 @@ public class ActSarItemsBussEOService { }); } }); - qualityEvaluationService.saveBatch(evaluations); + if (evaluations.get(0).getProcessNode().equals("重新技术委员会评审、评审意见修改")){ + qualityEvaluationService.saveBatch(evaluations); + qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId()); + }else { + qualityEvaluationService.saveBatch(evaluations); + } } } diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index c2495387..3170d113 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_20230531?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username = root spring.datasource.password = hzwlsoft.com 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 08fdeeba..a1caac28 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 @@ -1850,36 +1850,38 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); - if(getAttrMap.get("FBGBUSS")!=null){ - if(org.apache.commons.lang3.StringUtils.isNotBlank(getAttrMap.get("FBGBUSS").toString())){ - String[] split = getAttrMap.get("FBGBUSS").toString().split(","); - String fileId = ""; - for (String id :split){ - if(id.contains("ATT_FILE_")){ - //则是正规数据 - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileId)){ - fileId = fileId+","+ id; - }else { - fileId = id; - } - }else { - //加工数据 - QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); - onlineFileLogQueryWrapper.eq("HIS_ID",id); - onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); - List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); - if(!onlineFileLogs.isEmpty()){ - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileId)){ - fileId = fileId+","+onlineFileLogs.get(0).getAttFileId(); - }else { - fileId = onlineFileLogs.get(0).getAttFileId(); + if(getAttrMap!=null) { + if (getAttrMap.get("FBGBUSS") != null) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(getAttrMap.get("FBGBUSS").toString())) { + String[] split = getAttrMap.get("FBGBUSS").toString().split(","); + String fileId = ""; + for (String id : split) { + if (id.contains("ATT_FILE_")) { + //则是正规数据 + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileId)) { + fileId = fileId + "," + id; + } else { + fileId = id; + } + } else { + //加工数据 + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID", id); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); + if (!onlineFileLogs.isEmpty()) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileId)) { + fileId = fileId + "," + onlineFileLogs.get(0).getAttFileId(); + } else { + fileId = onlineFileLogs.get(0).getAttFileId(); + } } } - } + } + Object obj = fileId; + getAttrMap.put("FBGBUSS", obj); } - Object obj = fileId; - getAttrMap.put("FBGBUSS",obj); } } if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java index 0059d8ca..24acf1e0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -26,4 +26,15 @@ public interface QualityEvaluationDao extends BaseMapper { public List getEvaluationForm(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List selectCountZQYJ(@Param("node") String node,@Param("lawId") String lawId); + + List selectCountJSWY(@Param("node") String node,@Param("lawId") String lawId); + + List selectCXJSWY(@Param("node") String node,@Param("lawId") String lawId); + + List selectBZHFS(@Param("node") String node,@Param("lawId") String lawId); + + List selectBZSH(@Param("node") String node,@Param("lawId") String lawId); + + void updateByProcessNode(@Param("lawId") String lawId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index dc5e076a..832660f1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -81,6 +81,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl countZQYJList = qualityEvaluationDao.selectCountZQYJ(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countZQYJList.isEmpty()){ + countZQYJStr = countZQYJList.size(); + } + } + + if(qualityEvaluations.getProcessNode().equals("技术委员会评审、评审意见修改")) { + List countJSWYList = qualityEvaluationDao.selectCountJSWY(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countJSWYList.isEmpty()){ + countJSWYStr = countJSWYList.size(); + } + } + if(qualityEvaluations.getProcessNode().equals("重新技术委员会评审、评审意见修改")) { + List countCXJSWYList = qualityEvaluationDao.selectCXJSWY(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countCXJSWYList.isEmpty()){ + countCXJSWYStr = countCXJSWYList.size(); + } + } + if(qualityEvaluations.getProcessNode().equals("标准化复审")) { + List countBZHFSList = qualityEvaluationDao.selectBZHFS(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countBZHFSList.isEmpty()){ + countBZHFSStr = countBZHFSList.size(); + } + } + if(qualityEvaluations.getProcessNode().equals("标准法规部高级经理审核")) { + List countBZSHList = qualityEvaluationDao.selectBZSH(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countBZSHList.isEmpty()){ + countBZSHStr = countBZSHList.size(); + } + } + } + } + final Integer countZQYJ = countZQYJStr; + final Integer countJSWY = countJSWYStr; + final Integer countCXJSWY = countCXJSWYStr; + final Integer countBZHFS = countBZHFSStr; + final Integer countBZSH = countBZSHStr; + HashMap result = new HashMap<>(); result.put("dynamic",0.0); result.put("quality",0.0); @@ -203,19 +255,19 @@ public class QualityEvaluationServiceImpl extends ServiceImpl + + update quality_evaluation set score = '0' where law_id = #{lawId} and process_node = '技术委员会评审、评审意见修改' + + + + + + + + + + + +