From fe7e71962df61783b1791beb9347f3bf3e257d5f Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 7 Nov 2023 22:39:05 +0800 Subject: [PATCH] =?UTF-8?q?bug:=E8=AF=84=E5=88=86=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 15 ++---- .../service/IEsRevisePlanService.java | 4 +- .../service/impl/EsRevisePlanServiceImpl.java | 49 +++++++------------ .../dao/QualityEvaluationDao.java | 2 + .../service/IQualityEvaluationService.java | 2 +- .../impl/QualityEvaluationServiceImpl.java | 25 ++++++++-- .../QualityEvaluationMapper.xml | 9 ++++ 7 files changed, 57 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 595f6a2d..f10d5d5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -238,11 +238,11 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlanByState(esRevisePlan)); } - @ApiOperation(value = "编辑企标计划-企标技术更新计划状态-计算质量评分") - @PostMapping("modPlanByStateAndScore") - public ResponseMessage modPlanByStateAndScore(EsRevisePlan esRevisePlan){ - return Result.success(iEsRevisePlanService.modPlanByStateAndScore(esRevisePlan)); - } +// @ApiOperation(value = "编辑企标计划-企标技术更新计划状态-计算质量评分") +// @PostMapping("modPlanByStateAndScore") +// public ResponseMessage modPlanByStateAndScore(EsRevisePlan esRevisePlan){ +// return Result.success(iEsRevisePlanService.modPlanByStateAndScore(esRevisePlan)); +// } @ApiOperation(value = "编辑企标计划-流程") @PostMapping("modPlanByProcess") @@ -292,9 +292,4 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.oaUpdatePlans(esId,date,s)); } - @GetMapping("/updateScore") - public ResponseMessage updateScore(){ - return iEsRevisePlanService.updateScore(); - } - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 6872c98f..edbcf341 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -37,7 +37,5 @@ public interface IEsRevisePlanService extends IService { List batchToDoTasks(String json); - String modPlanByStateAndScore(EsRevisePlan esRevisePlan); - - ResponseMessage updateScore(); +// String modPlanByStateAndScore(EsRevisePlan esRevisePlan); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 87a548ca..014935b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -82,15 +82,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); // 获取质量评分 - NumberFormat nf = NumberFormat.getNumberInstance(); - nf.setMaximumFractionDigits(2); - nf.setRoundingMode(RoundingMode.UP); +// NumberFormat nf = NumberFormat.getNumberInstance(); +// nf.setMaximumFractionDigits(2); +// nf.setRoundingMode(RoundingMode.UP); if (esRevisePlan.getScore() == null){ for (EsRevisePlan revisePlan : esRevisePlans) { if (StringUtils.isNotBlank(revisePlan.getStandId())) { - Map scoreMap = qualityEvaluationService.getScore(revisePlan.getStandId()); - String quality = nf.format(scoreMap.get("quality")); - revisePlan.setScore(Double.valueOf(quality)); + String finalScore = qualityEvaluationService.getScore(revisePlan.getStandId()); + revisePlan.setScore(Double.valueOf(finalScore)); } } } @@ -284,29 +283,17 @@ public class EsRevisePlanServiceImpl extends ServiceImpl score = qualityEvaluationService.getScore(esRevisePlan.getStandId()); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(EsRevisePlan::getStandId, esRevisePlan.getStandId()); - wrapper.set(EsRevisePlan::getScore, score.get("quality")); - update(wrapper); - return "修改成功"; - } - - @Override - public ResponseMessage updateScore() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EsRevisePlan::getPlanStatus, "4"); - wrapper.isNotNull(EsRevisePlan::getStandId); - List esRevisePlans = esRevisePlanDao.selectList(wrapper); - for (EsRevisePlan esRevisePlan : esRevisePlans) { - esRevisePlan.setScore(qualityEvaluationService.getScore(esRevisePlan.getStandId()).get("quality")); - } - return Result.success("更新成功"); - } +// @Override +// public String modPlanByStateAndScore(EsRevisePlan esRevisePlan) { +// if (StringUtils.isBlank(esRevisePlan.getStandId())) { +// return "失败"; +// } +// modPlanByState(esRevisePlan); +// String score = qualityEvaluationService.getScore(esRevisePlan.getStandId()); +// LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); +// wrapper.eq(EsRevisePlan::getStandId, esRevisePlan.getStandId()); +// wrapper.set(EsRevisePlan::getScore, score.get("quality")); +// update(wrapper); +// return "修改成功"; +// } } 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 5de64e1d..0d5d20e1 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 @@ -37,6 +37,8 @@ public interface QualityEvaluationDao extends BaseMapper { List selectBZSH(@Param("node") String node,@Param("lawId") String lawId); + List selectDTPJ(String processNode,@Param("lawId") String lawId); + void updateByProcessNode(@Param("lawId") String lawId); @Select("select * from quality_evaluation") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index a1d589f3..9f240c0d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -27,7 +27,7 @@ public interface IQualityEvaluationService extends IService { public List getEvaluationForm(QualityEvaluation query); - Map getScore(String lawId); + String getScore(String lawId); ResponseMessage updateQualityEvaluation(); } 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 5014044f..0f926776 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 @@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.PipedReader; +import java.math.RoundingMode; +import java.text.NumberFormat; import java.util.*; import java.util.stream.Collector; import java.util.stream.Collectors; @@ -170,7 +172,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getScore(String lawId) { + public String getScore(String lawId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("law_id",lawId) @@ -194,6 +196,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl countDTPJList = qualityEvaluationDao.selectDTPJ(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId()); + if(!countDTPJList.isEmpty()){ + countDTPJStr = countDTPJList.size(); + } + } } } final Integer countZQYJ = countZQYJStr; @@ -234,6 +243,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl result = new HashMap<>(); result.put("dynamic",0.0); @@ -282,13 +292,20 @@ public class QualityEvaluationServiceImpl extends ServiceImpl +