From 9e49c4bb31898cead204500a3e841d50ef6183fc Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 4 Dec 2020 16:49:31 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0commandId=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 14 +++++++------- .../modules/flow/model/ResultRecordDetailDto.java | 2 ++ 2 files changed, 9 insertions(+), 7 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 620608ca..0f4a8b92 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -762,24 +762,25 @@ public class ResultRecordController extends AbstractController { } - if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){ + if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 isUp = true; - resultDetail1.setCheckResult("" + resultDetail1.getCheckResult() + ""); + resultDetail1.setKeyResult("" + resultDetail1.getKeyResult() + ""); + } + if(resultDetail.getIsDelete().intValue() == 1){//被删除了 + resultDetail.setIsDelete(0); + isUp = true; } - if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 isUp = true; - - //resultDetail1.setTarget("" + resultDetail1.getTarget() + ""); } if(isUp){ resultDetail1.setId(null); resultDetail1.setIsBack(1); resultDetail1.setTarget("" + resultDetail1.getTarget() + ""); resultDetail1.setBackId(resultDetail.getId()); - inserts.add(resultDetail); + inserts.add(resultDetail1); } } resultDetail.setPriority(index); @@ -814,7 +815,6 @@ public class ResultRecordController extends AbstractController { } resultDetail.setAcquireScore(score); weight = weight.add(resultDetail.getCheckWeight()); - } } diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index b2c906c0..19d1ad27 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -33,6 +33,8 @@ public class ResultRecordDetailDto { //备注 @ApiModelProperty(value = "备注", name = "remark") private String remark; + @ApiModelProperty(value = "业绩评论id", name = "commandId") + private Long commandId; //员工id @ApiModelProperty(value = "员工id", name = "staffId") private Long staffId; From 4d760b877581872bab214790482cd191f6513cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 4 Dec 2020 17:41:56 +0800 Subject: [PATCH 02/24] fix --- .../controller/ResultRecordController.java | 32 +++++++++++++++++-- .../app/req/RecordDetailExplanReq.java | 16 ++++++---- 2 files changed, 39 insertions(+), 9 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 b4023253..187d3807 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1,5 +1,6 @@ package com.lz.modules.app.controller; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.lz.common.emun.ChartFlowType; import com.lz.common.emun.WorkMsgTypeEnum; @@ -24,10 +25,13 @@ import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.sys.controller.AbstractController; +import com.lz.modules.sys.entity.Print; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultComment; import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; +import com.lz.modules.sys.service.PrintService; +import com.lz.modules.sys.service.ResourceService; import com.lz.modules.sys.service.app.ResultCommentService; import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; @@ -45,7 +49,9 @@ import java.lang.reflect.Method; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.*; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -111,6 +117,12 @@ public class ResultRecordController extends AbstractController { @Autowired private DingtalkBusiness dingtalkBusiness; + @Autowired + private PrintService printService; + + @Autowired + private ResourceService resourceService; + /** * 列表 */ @@ -1242,12 +1254,26 @@ public class ResultRecordController extends AbstractController { return R.ok(); } - @ApiOperation("导出绩效详情报表计划") + @ApiOperation("保存绩效详情报表计划") @PostMapping("/recordDetailExplan") public R recordDetailExport(@RequestBody List reqs){ + if(CollectionUtils.isEmpty(reqs)){ + return R.error("添加数据为空"); + } + String time = LocalDate.now().toString(); + List prints = Lists.newArrayList(); + int i =1; + for(RecordDetailExplanReq recordDetailExplanReq:reqs){ + Print print = new Print(); + BeanUtils.copyProperties(recordDetailExplanReq,print); + print.setBatchNo(time + "_" + recordDetailExplanReq.getRecordId() + "_" + i++); + print.setUrl(""); + prints.add(print); + } - - + /*if(!printService.saveBatch(prints)){ + return R.error("保存失败"); + }*/ return R.ok(); } diff --git a/src/main/java/com/lz/modules/app/req/RecordDetailExplanReq.java b/src/main/java/com/lz/modules/app/req/RecordDetailExplanReq.java index 077766ac..d26cf734 100644 --- a/src/main/java/com/lz/modules/app/req/RecordDetailExplanReq.java +++ b/src/main/java/com/lz/modules/app/req/RecordDetailExplanReq.java @@ -1,5 +1,7 @@ package com.lz.modules.app.req; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,13 +10,15 @@ import lombok.Data; * @Date: 2020/12/4 11:27 */ @Data +@ApiModel("保存导出计划") public class RecordDetailExplanReq { //绩效id + @ApiModelProperty(value = "绩效id", name = "recordId") private Long recordId; - - //是否导出图片 - private int image; - - //是否打印 - private int print; + //0不生成图片，1生成图片 + @ApiModelProperty(value = "0不生成图片，1生成图片", name = "isImage") + private Integer isImage; + //0不打印，1 打印 + @ApiModelProperty(value = "0不打印，1 打印", name = "isPrint") + private Integer isPrint; } From 4b45430b95f9c3d6d2662fee8e0d1951314f2fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 7 Dec 2020 10:59:53 +0800 Subject: [PATCH 03/24] fix --- .../app/controller/ResultRecordController.java | 17 +++++++++++++---- .../com/lz/modules/sys/dao/ResourceMapper.java | 1 + .../lz/modules/sys/service/ResourceService.java | 2 ++ .../sys/service/impl/ResourceServiceImpl.java | 6 ++++-- .../resources/mapper/sys/ResourceMapper.xml | 5 +++++ 5 files changed, 25 insertions(+), 6 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..201afee6 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,6 +26,7 @@ import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; +import com.lz.modules.sys.entity.Resource; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultComment; import com.lz.modules.sys.entity.app.ResultDetail; @@ -50,6 +51,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Consumer; import java.util.function.Function; @@ -123,6 +126,9 @@ public class ResultRecordController extends AbstractController { @Autowired private ResourceService resourceService; + private final static String TYPE = "H5_URL"; + private final static String SEC_TYPE = "RECORD"; + /** * 列表 */ @@ -1260,20 +1266,23 @@ public class ResultRecordController extends AbstractController { if(CollectionUtils.isEmpty(reqs)){ return R.error("添加数据为空"); } - String time = LocalDate.now().toString(); + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + String time = dtf.format(now); List prints = Lists.newArrayList(); int i =1; + Resource resource = resourceService.selectResourceByTypeAndSecType(TYPE, SEC_TYPE); for(RecordDetailExplanReq recordDetailExplanReq:reqs){ Print print = new Print(); BeanUtils.copyProperties(recordDetailExplanReq,print); print.setBatchNo(time + "_" + recordDetailExplanReq.getRecordId() + "_" + i++); - print.setUrl(""); + Optional.ofNullable(resource).ifPresent(resource1 -> print.setUrl(resource1.getValue())); prints.add(print); } - /*if(!printService.saveBatch(prints)){ + if(!printService.saveBatch(prints)){ return R.error("保存失败"); - }*/ + } return R.ok(); } diff --git a/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java b/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java index 9d5451c0..e55ec87d 100644 --- a/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java @@ -22,5 +22,6 @@ public interface ResourceMapper extends BaseMapper { int deleteResourceById(@Param("id") Long id); + Resource selectResourceByTypeAndSecType(@Param("type") String Type, @Param("secType") String secType); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/ResourceService.java b/src/main/java/com/lz/modules/sys/service/ResourceService.java index 3659c714..4255805d 100644 --- a/src/main/java/com/lz/modules/sys/service/ResourceService.java +++ b/src/main/java/com/lz/modules/sys/service/ResourceService.java @@ -21,5 +21,7 @@ public interface ResourceService extends IService { int deleteResourceById(Long id); + Resource selectResourceByTypeAndSecType(String type,String secType); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java index 2142a80d..5ea65d47 100644 --- a/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java @@ -49,6 +49,8 @@ public class ResourceServiceImpl extends ServiceImpl i return resourceMapper.deleteResourceById(id); } - - + @Override + public Resource selectResourceByTypeAndSecType(String type, String secType) { + return resourceMapper.selectResourceByTypeAndSecType(type,secType); + } } diff --git a/src/main/resources/mapper/sys/ResourceMapper.xml b/src/main/resources/mapper/sys/ResourceMapper.xml index eb1f3c28..ca5f7e5c 100644 --- a/src/main/resources/mapper/sys/ResourceMapper.xml +++ b/src/main/resources/mapper/sys/ResourceMapper.xml @@ -38,6 +38,11 @@ + + + insert into lz_resource( creator, From 9ad3d87eeecec71ceb858a8db482a1ae197b933d Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 11:54:23 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=A9=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 + + From e2616f675df2983fd42dd5179e3a1adfe0788f89 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 13:37:53 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9commandId=E4=B8=BAcomme?= =?UTF-8?q?ntId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 +++--- .../com/lz/modules/flow/model/ResultRecordDetailDto.java | 2 +- 2 files changed, 4 insertions(+), 4 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 deecf083..31b6d724 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -812,7 +812,7 @@ public class ResultRecordController extends AbstractController { } } - if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && resultDetail1 != null){ + if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){ //有评论id if(resultDetail1.getIsDelete().intValue() == 1){ commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n"); @@ -907,9 +907,9 @@ public class ResultRecordController extends AbstractController { resultRecordService.updateResultRecordById(resultRecord); - if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && commandValue.length() > 0){ + if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && commandValue.length() > 0){ //修改评论信息 - resultCommentService.updateResultCommentCommentById(dto.getCommandId(), commandValue); + resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); } return R.ok(); diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 19d1ad27..58648fbf 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -34,7 +34,7 @@ public class ResultRecordDetailDto { @ApiModelProperty(value = "备注", name = "remark") private String remark; @ApiModelProperty(value = "业绩评论id", name = "commandId") - private Long commandId; + private Long commentId; //员工id @ApiModelProperty(value = "员工id", name = "staffId") private Long staffId; From d23a9536f3244fda2d5d236a55f1e1bc89b92f30 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 14:01:59 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/ResultRecordController.java | 9 +++++---- src/main/resources/mapper/app/ResultCommentMapper.xml | 2 +- src/main/resources/mapper/app/ResultDetailMapper.xml | 4 ++-- 3 files changed, 8 insertions(+), 7 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 31b6d724..6eae6c67 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -815,33 +815,34 @@ public class ResultRecordController extends AbstractController { if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){ //有评论id if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n"); commandIndex++; resultDetail1.setIsBack(1); }else{ boolean isUp = false; if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 - commandValue += (commandIndex + "(修改) 名称：" + + commandValue += ("(修改) 名称：" + resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 - commandValue += (commandIndex + "(修改) 考核标准：" + + commandValue += ("(修改) 考核标准：" + resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 - commandValue += (commandIndex + "(修改) 权重：" + + commandValue += ("(修改) 权重：" + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\r\n"); isUp = true; } if(isUp){ + commandValue = commandValue + "：" + commandValue; commandIndex++; resultDetail1.setIsBack(1); } diff --git a/src/main/resources/mapper/app/ResultCommentMapper.xml b/src/main/resources/mapper/app/ResultCommentMapper.xml index f0ec404d..8e831093 100644 --- a/src/main/resources/mapper/app/ResultCommentMapper.xml +++ b/src/main/resources/mapper/app/ResultCommentMapper.xml @@ -113,7 +113,7 @@ update lz_result_comment set - + opt_desc = '修改了目标', 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 f6739378..a24c4744 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -147,7 +147,7 @@ + From 3717d59286e14ee9b6fea6603ed068d1e55939f7 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 14:51:48 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 148 ++++++++++-------- .../sys/dao/app/ResultDetailMapper.java | 2 + .../sys/service/app/ResultDetailService.java | 2 + .../app/impl/ResultDetailServiceImpl.java | 4 + .../mapper/app/ResultDetailMapper.xml | 4 + 5 files changed, 99 insertions(+), 61 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 6eae6c67..e4d4ab94 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -752,6 +752,8 @@ public class ResultRecordController extends AbstractController { Map mapDetails = resultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); + List updateResultDetails = new ArrayList<>(); + //获取当前绩效的节点 boolean isSetKeyResult = false; List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); @@ -762,8 +764,7 @@ public class ResultRecordController extends AbstractController { } } - String commandValue = ""; - int commandIndex = 1; + for (ResultRecortModelDto model:dto.getRecortModelDtos() ) { int index = 0; @@ -775,79 +776,43 @@ 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())){ - //这里判断是否有更新，或者删除 - resultDetail1 = mapDetails.get(resultDetail.getId()); - boolean isUp = false; - if(resultDetail.getIsDelete().intValue() == 1){//被删除了 - 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(2); - resultDetail1.setBackId(resultDetail.getId()); - inserts.add(resultDetail1); - } - }else{ - //查询本detail是否编辑过 - resultDetail1 = resultDetailService.selectNotNoticeResultDetailByBackId(resultDetail.getId()); - if(resultDetail1 != null){ - updates.add(resultDetail1); - } - - } - if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){ - //有评论id - if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n"); - commandIndex++; - resultDetail1.setIsBack(1); - }else{ + if(resultDetail.getIsDelete().intValue() == 1){//被删除了 + resultDetail.setIsBack(2); + resultDetail.setBackId(resultDetail.getId()); + updateResultDetails.add(resultDetail); + }else { + if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ + //这里判断是否有更新，或者删除 boolean isUp = false; + ResultDetail resultDetail1 = null; + resultDetail1 = mapDetails.get(resultDetail.getId()); + + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 - commandValue += ("(修改) 名称：" + - resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; - } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 - commandValue += ("(修改) 考核标准：" + - resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; } + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 - commandValue += ("(修改) 权重：" + - resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" - + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + - "%\r\n"); isUp = true; } if(isUp){ - commandValue = commandValue + "：" + commandValue; - commandIndex++; - resultDetail1.setIsBack(1); + resultDetail1.setId(null); + resultDetail1.setIsBack(2); + resultDetail1.setBackId(resultDetail.getId()); + inserts.add(resultDetail1); } } + + } + resultDetail.setPriority(index); index++; @@ -908,14 +873,75 @@ public class ResultRecordController extends AbstractController { resultRecordService.updateResultRecordById(resultRecord); - if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && commandValue.length() > 0){ + if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 - resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); + updateResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; + log.info("可能需要写入评论的内容条数{}", updateResultDetails.size()); + //去重 + mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); + updateResultDetails = mapDetails.values().stream().collect(Collectors.toList()); + log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); + if(updateResultDetails.size() > 0){ + updates.addAll(inserts); + + mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); + + String commandValue = ""; + int commandIndex = 1; + for (ResultDetail resultDetail1:updateResultDetails + ) { + log.info("修改的对象为{}", resultDetail1); + if(resultDetail1.getIsDelete().intValue() == 1){ + commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n"); + commandIndex++; + resultDetail1.setIsBack(1); + }else{ + + ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId()); + if(resultDetail != null){ + log.info("修改后的对象为{}", resultDetail1); + boolean isUp = false; + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ + //打上标识 + commandValue += ("(修改) 名称：" + + resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); + isUp = true; + + } + if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ + //打上标识 + commandValue += ("(修改) 考核标准：" + + resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); + isUp = true; + } + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + commandValue += ("(修改) 权重：" + + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" + + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + + "%\r\n"); + isUp = true; + } + if(isUp){ + commandValue = commandValue + "：" + commandValue; + commandIndex++; + resultDetail1.setIsBack(1); + } + } + + } + } + if(commandValue.length() > 0){ + log.info("需要写入评论，具体呢容为{}", commandValue); + resultDetailService.updateBatchById(updateResultDetails); + resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); + } + } + + } return R.ok(); - - } /** 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 cf20b5a9..a99e12d1 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 @@ -50,4 +50,6 @@ public interface ResultDetailMapper extends BaseMapper { int deleteResultDetailByRecordId(@Param("recordId") Long recordId); ResultDetail selectNotNoticeResultDetailByBackId(@Param("backId") Long backId); + + List selectNotNoticeResultDetailByRecordId(@Param("recordId") Long recordId); } \ 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 c7f5d852..8fe6ad2b 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 @@ -74,4 +74,6 @@ public interface ResultDetailService extends IService { int deleteResultDetailByRecordId(Long recordId); ResultDetail selectNotNoticeResultDetailByBackId(Long id); + + List selectNotNoticeResultDetailByRecordId(Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index 075b03b9..83c04159 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -350,4 +350,8 @@ public class ResultDetailServiceImpl extends ServiceImpl selectNotNoticeResultDetailByRecordId(Long recordId){ + return resultDetailMapper.selectNotNoticeResultDetailByRecordId(recordId); + } } diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index a24c4744..50f504c4 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -207,5 +207,9 @@ select * from lz_result_detail where back_id = #{backId} and is_back = 2 order by priority asc + + From c49306c2a1c77e12a5b4fe2547cc8ce685e80dd4 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 15:32:19 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 e4d4ab94..78a6b21b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -777,7 +777,7 @@ public class ResultRecordController extends AbstractController { ResultDetail resultDetail = new ResultDetail(); BeanUtils.copyProperties(detailDto, resultDetail); - if(resultDetail.getIsDelete().intValue() == 1){//被删除了 + if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 resultDetail.setIsBack(2); resultDetail.setBackId(resultDetail.getId()); updateResultDetails.add(resultDetail); @@ -901,29 +901,33 @@ public class ResultRecordController extends AbstractController { if(resultDetail != null){ log.info("修改后的对象为{}", resultDetail1); boolean isUp = false; + String value = ""; + String heard = ""; if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 - commandValue += ("(修改) 名称：" + + value += ("(修改) 名称：" + resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; + }else{ + heard = resultDetail1.getTarget() + "：\r\n"; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 - commandValue += ("(修改) 考核标准：" + + value += ("(修改) 考核标准：" + resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 - commandValue += ("(修改) 权重：" + + value += ("(修改) 权重：" + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\r\n"); isUp = true; } if(isUp){ - commandValue = commandValue + "：" + commandValue; + commandValue += (commandIndex + "：" + heard + value); commandIndex++; resultDetail1.setIsBack(1); } From f2fb7854232d65164c10ac2fbe0aff3eb5c5ce00 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 15:45:29 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 ++ src/main/resources/mapper/app/ResultDetailMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 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 78a6b21b..2c3f0b82 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -781,6 +781,8 @@ public class ResultRecordController extends AbstractController { resultDetail.setIsBack(2); resultDetail.setBackId(resultDetail.getId()); updateResultDetails.add(resultDetail); + }else if(resultDetail.getId() == null){ + resultDetail.setIsBack(3);//新增 }else { if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ //这里判断是否有更新，或者删除 diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index 50f504c4..d5ac1dc0 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -196,7 +196,7 @@ @@ -208,7 +208,7 @@ From 4b0fb6eaa6aa350e6850764699ab788d6144386a Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 15:51:44 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 2c3f0b82..f2c64844 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -897,6 +897,10 @@ public class ResultRecordController extends AbstractController { commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n"); commandIndex++; resultDetail1.setIsBack(1); + }else if(resultDetail1.getIsBack().intValue() == 3){ + commandValue += (commandIndex + "：(新增)" + resultDetail1.getTarget() + "\r\n"); + commandIndex++; + resultDetail1.setIsBack(0); }else{ ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId()); From 5eab0c77fce4ab7b103cccdeca7a91a9ab2832f9 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 16:00:50 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 f2c64844..243f9563 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -894,11 +894,11 @@ public class ResultRecordController extends AbstractController { ) { log.info("修改的对象为{}", resultDetail1); if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\r\n"); commandIndex++; resultDetail1.setIsBack(1); }else if(resultDetail1.getIsBack().intValue() == 3){ - commandValue += (commandIndex + "：(新增)" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\r\n"); commandIndex++; resultDetail1.setIsBack(0); }else{ @@ -916,7 +916,7 @@ public class ResultRecordController extends AbstractController { isUp = true; }else{ - heard = resultDetail1.getTarget() + "：\r\n"; + heard = "指标：" + resultDetail1.getTarget() + "\r\n"; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 From 5787104f13a0d9c0b3c6f5f10059b9b513a9e2c5 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 16:06:29 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 243f9563..be2d2af8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -921,7 +921,7 @@ public class ResultRecordController extends AbstractController { if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 value += ("(修改) 考核标准：" + - resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); + resultDetail1.getKeyResult() + " 为：" + resultDetail.getKeyResult() + "\r\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ From c333fc78a424688e7c07d12568030b953d66fcc1 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Dec 2020 16:13:31 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 be2d2af8..4b8e4c13 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -894,11 +894,11 @@ public class ResultRecordController extends AbstractController { ) { log.info("修改的对象为{}", resultDetail1); if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\n"); commandIndex++; resultDetail1.setIsBack(1); }else if(resultDetail1.getIsBack().intValue() == 3){ - commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\n"); commandIndex++; resultDetail1.setIsBack(0); }else{ @@ -912,24 +912,24 @@ public class ResultRecordController extends AbstractController { if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 value += ("(修改) 名称：" + - resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); + resultDetail1.getTarget()+ " \n(为)：\n" + resultDetail.getTarget() + "\n"); isUp = true; }else{ - heard = "指标：" + resultDetail1.getTarget() + "\r\n"; + heard = "指标：" + resultDetail1.getTarget() + "\n"; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 value += ("(修改) 考核标准：" + - resultDetail1.getKeyResult() + " 为：" + resultDetail.getKeyResult() + "\r\n"); + resultDetail1.getKeyResult() + "\n(为)：\n" + resultDetail.getKeyResult() + "\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 value += ("(修改) 权重：" + - resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为)：\n" + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + - "%\r\n"); + "%\n"); isUp = true; } if(isUp){ From 5b68b85c53596cf0cb3a8f8e5307a0e93402dd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 7 Dec 2020 17:03:07 +0800 Subject: [PATCH 14/24] fix --- .../controller/ResultRecordController.java | 11 +++-- .../app/resp/RecordDetailExportResp.java | 48 +++++++++++++++++++ .../controller/AssessManagerController.java | 9 ++++ 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java 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 201afee6..2e2ed29b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -14,6 +14,7 @@ import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.app.req.RecordDetailExplanReq; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.app.resp.RecordDetailExportResp; import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; @@ -24,6 +25,7 @@ import com.lz.modules.flow.model.*; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; import com.lz.modules.sys.entity.Resource; @@ -97,8 +99,6 @@ public class ResultRecordController extends AbstractController { @Autowired private EvaluationStartStaffService evaluationStartStaffService; - - @Autowired private StaffRoleService staffRoleService; @@ -126,6 +126,9 @@ public class ResultRecordController extends AbstractController { @Autowired private ResourceService resourceService; + @Autowired + private ChartResultService chartResultService; + private final static String TYPE = "H5_URL"; private final static String SEC_TYPE = "RECORD"; @@ -1249,15 +1252,17 @@ public class ResultRecordController extends AbstractController { @ApiOperation("导出绩效详情报表") @GetMapping("/recordDetailExport") public R recordDetailExport(Long recordId){ + RecordDetailExportResp resp = new RecordDetailExportResp(); Map map = Maps.newHashMap(); map.put("id",recordId); R respnse = getDetail(map); if(respnse.isSuccess()){ ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data"); + //chartResultService.selectLevelDetailList(req); } - return R.ok(); + return R.ok().put("data",resp); } @ApiOperation("保存绩效详情报表计划") diff --git a/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java b/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java new file mode 100644 index 00000000..42b97735 --- /dev/null +++ b/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java @@ -0,0 +1,48 @@ +package com.lz.modules.app.resp; + +import com.lz.modules.flow.model.ResultRecortModelDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/12/7 15:53 + */ +@Data +public class RecordDetailExportResp { + + //员工工号 + @ApiModelProperty(value = "员工工号", name = "jobNumber") + private String jobNumber; + //员工姓名 + @ApiModelProperty(value = "员工姓名", name = "staffName") + private String staffName; + //职位 + @ApiModelProperty(value = "职位", name = "position") + private String position; + //最后得分 + @ApiModelProperty(value = "最后得分", name = "allScore") + private BigDecimal allScore; + //等级 + @ApiModelProperty(value = "等级", name = "scoreLevel") + private String scoreLevel; + + @ApiModelProperty(value = "考核维度合计", name = "recortModelDtos") + List recortModelDtos; + //一级部门 + @ApiModelProperty(value = "一级部门", name = "departmentOne") + private String departmentOne; + //二级部门 + @ApiModelProperty(value = "二级部门", name = "departmentTwo") + private String departmentTwo; + //三级部门 + @ApiModelProperty(value = "三级部门", name = "departmentThree") + private String departmentThree; + + //直属上级 + //考核月份 +} diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 2dbee8f0..5f6b4173 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -6,7 +6,9 @@ import com.lz.common.utils.StringUtil; import com.lz.modules.app.dto.StaffSimpleDto; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; +import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.service.EvaluationStartStaffService; +import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.performance.req.AssessChangeReq; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.AssessDetailReq; @@ -46,6 +48,8 @@ public class AssessManagerController extends AbstractController{ private ResultRecordMapper resultRecordMapper; @Autowired private ChartResultService chartResultService; + @Autowired + private StaffRoleService staffRoleService; @@ -127,6 +131,11 @@ public class AssessManagerController extends AbstractController{ return R.error("没有此条记录"); } try { + Long userId = getUserId(); + StaffRole role = staffRoleService.selectByStaffId(userId); + if(role == null || role.getDepartmentId()!=0){ + return R.error("您不是绩效管理员或未管理全公司，无法删除此任务"); + } assessManagerService.accessDelete(flowStart); } catch (Exception e) { log.error("删除考核任务异常, id:" + assessId ,e); From c029461eeeaff3adf3d9454b09cfe39fae0a612d Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 10:34:16 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=8D=E5=88=B6?= =?UTF-8?q?=E5=AE=9A=E7=9B=AE=E6=A0=87=E6=98=AF=E5=8F=AF=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 122 ++++++++++-------- 1 file changed, 66 insertions(+), 56 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 4b8e4c13..4150e2c8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -882,73 +882,83 @@ public class ResultRecordController extends AbstractController { //去重 mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); updateResultDetails = mapDetails.values().stream().collect(Collectors.toList()); - log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); - if(updateResultDetails.size() > 0){ - updates.addAll(inserts); + if(!isSetKeyResult){ + log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); + if(updateResultDetails.size() > 0){ + updates.addAll(inserts); - mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); + mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); - String commandValue = ""; - int commandIndex = 1; - for (ResultDetail resultDetail1:updateResultDetails - ) { - log.info("修改的对象为{}", resultDetail1); - if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\n"); - commandIndex++; - resultDetail1.setIsBack(1); - }else if(resultDetail1.getIsBack().intValue() == 3){ - commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\n"); - commandIndex++; - resultDetail1.setIsBack(0); - }else{ + String commandValue = ""; + int commandIndex = 1; + for (ResultDetail resultDetail1:updateResultDetails + ) { + log.info("修改的对象为{}", resultDetail1); + if(resultDetail1.getIsDelete().intValue() == 1){ + commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\n"); + commandIndex++; + resultDetail1.setIsBack(1); + }else if(resultDetail1.getIsBack().intValue() == 3){ + commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\n"); + commandIndex++; + resultDetail1.setIsBack(0); + }else{ - ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId()); - if(resultDetail != null){ - log.info("修改后的对象为{}", resultDetail1); - boolean isUp = false; - String value = ""; - String heard = ""; - if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ - //打上标识 - value += ("(修改) 名称：" + - resultDetail1.getTarget()+ " \n(为)：\n" + resultDetail.getTarget() + "\n"); - isUp = true; + ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId()); + if(resultDetail != null){ + log.info("修改后的对象为{}", resultDetail1); + boolean isUp = false; + String value = ""; + String heard = ""; + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ + //打上标识 + value += ("(修改) 名称：" + + resultDetail1.getTarget()+ " \n(为)：\n" + resultDetail.getTarget() + "\n"); + isUp = true; - }else{ - heard = "指标：" + resultDetail1.getTarget() + "\n"; - } - if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ - //打上标识 - value += ("(修改) 考核标准：" + - resultDetail1.getKeyResult() + "\n(为)：\n" + resultDetail.getKeyResult() + "\n"); - isUp = true; - } - if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ - //打上标识 - value += ("(修改) 权重：" + - resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为)：\n" - + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + - "%\n"); - isUp = true; - } - if(isUp){ - commandValue += (commandIndex + "：" + heard + value); - commandIndex++; - resultDetail1.setIsBack(1); + }else{ + heard = "指标：" + resultDetail1.getTarget() + "\n"; + } + if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ + //打上标识 + value += ("(修改) 考核标准：" + + resultDetail1.getKeyResult() + "\n(为)：\n" + resultDetail.getKeyResult() + "\n"); + isUp = true; + } + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + value += ("(修改) 权重：" + + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为)：\n" + + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + + "%\n"); + isUp = true; + } + if(isUp){ + commandValue += (commandIndex + "：" + heard + value); + commandIndex++; + resultDetail1.setIsBack(1); + } } + } + } + if(commandValue.length() > 0){ + log.info("需要写入评论，具体呢容为{}", commandValue); + resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); } } - if(commandValue.length() > 0){ - log.info("需要写入评论，具体呢容为{}", commandValue); - resultDetailService.updateBatchById(updateResultDetails); - resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); + }else{ + for (ResultDetail resultDetail1:updateResultDetails + ) { + if(resultDetail1.getIsBack().intValue() == 3){ + resultDetail1.setIsBack(0); + }else{ + resultDetail1.setIsBack(1); + } } } - - + resultDetailService.updateBatchById(updateResultDetails); } return R.ok(); From 6a25ce407c580d595abc071d39841e5fc4c1b779 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 10:52:49 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=AE=9A?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=97=B6=E5=8F=AF=E8=83=BD=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 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 ea322f40..e6b21e1e 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -777,45 +777,45 @@ public class ResultRecordController extends AbstractController { ) {//排序 ResultDetail resultDetail = new ResultDetail(); BeanUtils.copyProperties(detailDto, resultDetail); - - if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 - resultDetail.setIsBack(2); - resultDetail.setBackId(resultDetail.getId()); - updateResultDetails.add(resultDetail); - }else if(resultDetail.getId() == null){ - resultDetail.setIsBack(3);//新增 - }else { - if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ - //这里判断是否有更新，或者删除 - boolean isUp = false; - ResultDetail resultDetail1 = null; - resultDetail1 = mapDetails.get(resultDetail.getId()); + if(!isSetKeyResult){ + if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 + resultDetail.setIsBack(2); + resultDetail.setBackId(resultDetail.getId()); + updateResultDetails.add(resultDetail); + }else if(resultDetail.getId() == null){ + resultDetail.setIsBack(3);//新增 + }else { + if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ + //这里判断是否有更新，或者删除 + boolean isUp = false; + ResultDetail resultDetail1 = null; + resultDetail1 = mapDetails.get(resultDetail.getId()); - if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ - //打上标识 - isUp = true; - } - if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ - //打上标识 - isUp = true; - } + 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(2); - resultDetail1.setBackId(resultDetail.getId()); - inserts.add(resultDetail1); + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + isUp = true; + } + if(isUp){ + resultDetail1.setId(null); + resultDetail1.setIsBack(2); + resultDetail1.setBackId(resultDetail.getId()); + inserts.add(resultDetail1); + } } } - - } + resultDetail.setPriority(index); index++; From 1d99821249504c1dd13a2411b3703b47ca4c62aa Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 11:28:44 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e6b21e1e..db48af5b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -770,9 +770,9 @@ public class ResultRecordController extends AbstractController { ) { int index = 0; BigDecimal weight = BigDecimal.ZERO; - if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ + /*if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); - } + }*/ for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 ResultDetail resultDetail = new ResultDetail(); @@ -1290,7 +1290,7 @@ public class ResultRecordController extends AbstractController { recordFile.setIsDelete(1); recordFileService.updateRecordFileById(recordFile); return R.ok(); - } + }lzresultrecord/saveDetail /** From bbc232fa481177b42097638d82b642e377fbde73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 8 Dec 2020 11:30:31 +0800 Subject: [PATCH 18/24] fix --- .../lz/modules/app/controller/ResultRecordController.java | 5 +++++ 1 file changed, 5 insertions(+) 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 ba4c5767..d73d28d6 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -25,6 +25,7 @@ import com.lz.modules.flow.model.*; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; @@ -1335,6 +1336,7 @@ public class ResultRecordController extends AbstractController { @ApiOperation("导出绩效详情报表") @GetMapping("/recordDetailExport") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = RecordDetailExportResp.class)}) public R recordDetailExport(Long recordId){ RecordDetailExportResp resp = new RecordDetailExportResp(); Map map = Maps.newHashMap(); @@ -1343,7 +1345,9 @@ public class ResultRecordController extends AbstractController { if(respnse.isSuccess()){ ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data"); //chartResultService.selectLevelDetailList(req); + // TODO 暂时按照详情页面数据返回 + resp.setRecortModelDtos(resultRecordDetailDto.getRecortModelDtos()); } return R.ok().put("data",resp); @@ -1351,6 +1355,7 @@ public class ResultRecordController extends AbstractController { @ApiOperation("保存绩效详情报表计划") @PostMapping("/recordDetailExplan") + @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R recordDetailExport(@RequestBody List reqs){ if(CollectionUtils.isEmpty(reqs)){ return R.error("添加数据为空"); From 0361e3384782b2d24be4e96b22003f1dbd200f7c Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 13:23:41 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db48af5b..7c6e5d2a 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1290,7 +1290,7 @@ public class ResultRecordController extends AbstractController { recordFile.setIsDelete(1); recordFileService.updateRecordFileById(recordFile); return R.ok(); - }lzresultrecord/saveDetail + } /** From 73dc741b51620e3a79330dc5448df6abf532ca63 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 13:40:20 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 7c6e5d2a..09b278ee 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -759,8 +759,9 @@ public class ResultRecordController extends AbstractController { boolean isSetKeyResult = false; List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); if(flowRecords.size() > 0){ - if(flowRecords.get(0).getFlowProcess().intValue() == 0){ + if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存，所以这里写了小于2 //指定目标中 + log.info("制定目标中"); isSetKeyResult = true; } } From 4a1674ec8afd02fedbd5fb564a8bea636914ce0d Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 14:16:22 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 09b278ee..19da4c3f 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -946,8 +946,15 @@ public class ResultRecordController extends AbstractController { } if(commandValue.length() > 0){ log.info("需要写入评论，具体呢容为{}", commandValue); - - resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); + ResultComment resultComment = resultCommentService.selectResultCommentById(dto.getCommentId()); + if(resultComment.getOptDesc().indexOf("制定了目标") >= 0){ + resultComment.setOptDesc("修改了目标"); + resultComment.setComment(commandValue); + }else{ + resultComment.setOptDesc(resultComment.getOptDesc() + "修改了目标"); + resultComment.setComment(resultComment.getComment() + commandValue); + } + resultCommentService.updateResultCommentById(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue); } } }else{ From bf9391b30a1df9c1d9ded9257b8c96b5b11a55e0 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 14:26:31 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E9=97=AE=E9=A2=98=E7=9A=84=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 17 +++++++++++++---- .../flow/model/ResultRecordDetailDto.java | 3 +++ 2 files changed, 16 insertions(+), 4 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 19da4c3f..8a2cb5e3 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -759,11 +759,20 @@ public class ResultRecordController extends AbstractController { boolean isSetKeyResult = false; List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); if(flowRecords.size() > 0){ - if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存，所以这里写了小于2 - //指定目标中 - log.info("制定目标中"); - isSetKeyResult = true; + if(dto.getSave() != null && dto.getSave().intValue() ==1){ + if(flowRecords.get(0).getFlowProcess().intValue() < 1){//因为先提交流程在保存，所以这里写了小于2 + //指定目标中 + log.info("暂存制定目标中"); + isSetKeyResult = true; + } + }else{ + if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存，所以这里写了小于2 + //指定目标中 + log.info("制定目标中"); + isSetKeyResult = true; + } } + } diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 58648fbf..fa661127 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -42,6 +42,9 @@ public class ResultRecordDetailDto { @ApiModelProperty(value = "任务id", name = "startId") private Long startId; + @ApiModelProperty(value = "暂存", name = "save") + private Integer save; + //使用的哪个等级。等级组id，lz_result_grade的group_id From eced4b0bfa1c12d9299b1fd19ce7d6503bf37a70 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 8 Dec 2020 14:45:44 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/entity/app/ResultDetail.java | 8 ++++---- .../mapper/app/ResultDetailMapper.xml | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java b/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java index 3b477599..38a4bcaf 100644 --- a/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java +++ b/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java @@ -36,7 +36,7 @@ public class ResultDetail implements java.io.Serializable { private Long backId; //是否为备份，0非备份，1备份值 @ApiModelProperty(value = "是否为备份，0非备份，1备份值", name = "isBack") - private Integer isBack; + private Integer isEdit; //1，业绩，2文化价值观 @ApiModelProperty(value = "1，业绩，2文化价值观", name = "type") private Integer type; @@ -159,14 +159,14 @@ public class ResultDetail implements java.io.Serializable { * @return */ public Integer getIsBack() { - return isBack; + return isEdit; } /** * 是否为备份，0非备份，1备份值 * @param isBack */ public void setIsBack(Integer isBack) { - this.isBack = isBack; + this.isEdit = isBack; } /** @@ -387,7 +387,7 @@ public class ResultDetail implements java.io.Serializable { ",gmtCreate=" + gmtCreate + ",gmtModified=" + gmtModified + ",backId=" + backId + - ",isBack=" + isBack + + ",isBack=" + isEdit + ",type=" + type + ",target=" + target + ",keyResult=" + keyResult + diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index d5ac1dc0..fa8bf059 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -9,7 +9,7 @@ - + @@ -29,7 +29,7 @@ - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, back_id AS backId, is_back AS isBack, type AS type, target AS target, key_result AS keyResult, key_result_3_5 AS keyResult35, key_result_3_7 AS keyResult37, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, staff_id AS staffId, priority AS priority, model_id AS modelId + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, back_id AS backId, is_edit AS isEdit, type AS type, target AS target, key_result AS keyResult, key_result_3_5 AS keyResult35, key_result_3_7 AS keyResult37, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, staff_id AS staffId, priority AS priority, model_id AS modelId @@ -43,7 +43,7 @@ insert into lz_result_detail( back_id, - is_back, + is_edit, type, target, key_result, @@ -63,7 +63,7 @@ gmt_modified )values( #{ backId}, - #{ isBack}, + #{ isEdit}, #{ type}, #{ target}, #{ keyResult}, @@ -92,7 +92,7 @@ is_delete = #{isDelete}, gmt_create = #{gmtCreate}, back_id = #{backId}, - is_back = #{isBack}, + is_edit = #{isEdit}, type = #{type}, target = #{target}, key_result = #{keyResult}, @@ -120,7 +120,7 @@ is_delete = #{isDelete}, gmt_create = #{gmtCreate}, back_id = #{backId}, - is_back = #{isBack}, + is_edit = #{isEdit}, type = #{type}, target = #{target}, key_result = #{keyResult}, @@ -147,7 +147,7 @@ - select * from lz_result_detail where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and (is_back = 0 or is_back = 3) order by priority asc + select * from lz_result_detail where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and (is_edit = 0 or is_edit = 3) order by priority asc @@ -204,11 +204,11 @@ From baa126f16f4887db9d2b26c1e7793b6fa76cbaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 8 Dec 2020 17:29:43 +0800 Subject: [PATCH 24/24] fix --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 601025b9..90c5f587 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1291,7 +1291,7 @@ public class ResultRecordController extends AbstractController { recordFile.setIsDelete(1); recordFileService.updateRecordFileById(recordFile); return R.ok(); - }lzresultrecord/saveDetail + } /**