From 9ad3d87eeecec71ceb858a8db482a1ae197b933d Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 11:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9=E7=BB=A9?= =?UTF-8?q?=E6=95=88=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 87 +++++++++++++++---- .../sys/dao/app/ResultCommentMapper.java | 1 + .../sys/dao/app/ResultDetailMapper.java | 2 + .../sys/service/app/ResultCommentService.java | 2 + .../sys/service/app/ResultDetailService.java | 2 + .../app/impl/ResultCommentServiceImpl.java | 5 ++ .../app/impl/ResultDetailServiceImpl.java | 5 ++ .../mapper/app/ResultCommentMapper.xml | 9 ++ .../mapper/app/ResultDetailMapper.xml | 6 +- 9 files changed, 99 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 23a3ee5d..3b469322 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -123,6 +123,7 @@ public class ResultRecordController extends AbstractController { @Autowired private ResourceService resourceService; + /** * 列表 */ @@ -755,6 +756,8 @@ public class ResultRecordController extends AbstractController { } } + String commandValue = ""; + int commandIndex = 1; for (ResultRecortModelDto model:dto.getRecortModelDtos() ) { int index = 0; @@ -766,36 +769,77 @@ public class ResultRecordController extends AbstractController { ) {//排序 ResultDetail resultDetail = new ResultDetail(); BeanUtils.copyProperties(detailDto, resultDetail); + ResultDetail resultDetail1 = null; if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ //这里判断是否有更新，或者删除 - ResultDetail resultDetail1 = mapDetails.get(resultDetail.getId()); + resultDetail1 = mapDetails.get(resultDetail.getId()); boolean isUp = false; - if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ - //打上标识 - isUp = true; - - } - - if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ - //打上标识 - isUp = true; - resultDetail1.setKeyResult("" + resultDetail1.getKeyResult() + ""); - } if(resultDetail.getIsDelete().intValue() == 1){//被删除了 - resultDetail.setIsDelete(0); - isUp = true; - } - if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ - //打上标识 isUp = true; + }else{ + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ + //打上标识 + isUp = true; + } + if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ + //打上标识 + isUp = true; + } + + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + isUp = true; + } } + if(isUp){ resultDetail1.setId(null); - resultDetail1.setIsBack(1); - resultDetail1.setTarget("" + resultDetail1.getTarget() + ""); + resultDetail1.setIsBack(2); resultDetail1.setBackId(resultDetail.getId()); inserts.add(resultDetail1); } + }else{ + //查询本detail是否编辑过 + resultDetail1 = resultDetailService.selectNotNoticeResultDetailByBackId(resultDetail.getId()); + if(resultDetail1 != null){ + updates.add(resultDetail1); + } + + } + if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && resultDetail1 != null){ + //有评论id + if(resultDetail1.getIsDelete().intValue() == 1){ + commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n"); + commandIndex++; + resultDetail1.setIsBack(1); + }else{ + boolean isUp = false; + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ + //打上标识 + commandValue += (commandIndex + "(修改) 名称：" + + resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); + isUp = true; + + } + if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ + //打上标识 + commandValue += (commandIndex + "(修改) 考核标准：" + + resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); + isUp = true; + } + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + commandValue += (commandIndex + "(修改) 权重：" + + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" + + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + + "%\r\n"); + isUp = true; + } + if(isUp){ + commandIndex++; + resultDetail1.setIsBack(1); + } + } } resultDetail.setPriority(index); @@ -857,6 +901,11 @@ public class ResultRecordController extends AbstractController { resultRecordService.updateResultRecordById(resultRecord); + if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && commandValue.length() > 0){ + //修改评论信息 + resultCommentService.updateResultCommentCommentById(dto.getCommandId(), commandValue); + } + return R.ok(); diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultCommentMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultCommentMapper.java index aa02c47d..384a9b20 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultCommentMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultCommentMapper.java @@ -38,4 +38,5 @@ public interface ResultCommentMapper extends BaseMapper { ResultComment selectLastComment(@Param("recordId") Long recordId); + int updateResultCommentCommentById(@Param("commandId") Long commandId, @Param("commandValue") String commandValue); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultDetailMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultDetailMapper.java index e57b1598..cf20b5a9 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultDetailMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultDetailMapper.java @@ -48,4 +48,6 @@ public interface ResultDetailMapper extends BaseMapper { List selectDtosByRecordId(@Param("recordResultId") Long id, @Param("modelId") Long modelId); int deleteResultDetailByRecordId(@Param("recordId") Long recordId); + + ResultDetail selectNotNoticeResultDetailByBackId(@Param("backId") Long backId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultCommentService.java b/src/main/java/com/lz/modules/sys/service/app/ResultCommentService.java index 2c40aa72..f9abc583 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultCommentService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultCommentService.java @@ -40,4 +40,6 @@ public interface ResultCommentService extends IService { void addOrUpdateComment(ResultRecordReq req, Long userId, int status , FlowRecord lastUsedFlowRecord); + + int updateResultCommentCommentById(Long commandId, String commandValue); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java index b79f45d5..c7f5d852 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java @@ -72,4 +72,6 @@ public interface ResultDetailService extends IService { List selectDtosByRecordId(Long id, Long modelId); int deleteResultDetailByRecordId(Long recordId); + + ResultDetail selectNotNoticeResultDetailByBackId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultCommentServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultCommentServiceImpl.java index 78929397..899a7e7a 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultCommentServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultCommentServiceImpl.java @@ -113,4 +113,9 @@ public class ResultCommentServiceImpl extends ServiceImpl + + update + lz_result_comment + set + + comment = #{commandValue} + ,gmt_modified = now() + where id = #{commandId} + diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index 256ba69d..f6739378 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -196,12 +196,16 @@ update lz_result_detail set is_delete = 1, gmt_modified = now() where record_id=#{recordId} and is_delete = 0 + +