diff --git a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java index e524ded..feaec8d 100644 --- a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java +++ b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java @@ -98,6 +98,12 @@ public class ComplaintCollectionController { return complaintCollectionService.forceTermination(request); } + @Operation(description = "办理页面保存:保存涉及人员/领导等JSON") + @PostMapping("/saveInvolveJson") + public Result saveInvolveJson(@RequestBody ComplaintCollectionSaveInvolveJsonRequest request){ + return complaintCollectionService.saveInvolveJson(request); + } + @Operation(description = "初核反馈") @PostMapping("/initialReview") diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index c512249..2eee504 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -52,8 +52,6 @@ public class ApplyCompletionAction implements Action { private final ComplaintCollectionResourceService complaintCollectionResourceService; - private final SupDepartResourceService supDepartResourceService; - @Override public void next(ActionDto actionDto) { VerifyData verifyData = BeanUtil.toBean(actionDto.getData(), VerifyData.class); diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java index 8a9a4e8..4a4edae 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java @@ -186,7 +186,7 @@ public class ComplaintCollectionAddRequest implements ParamChecked { // throw new IllegalArgumentException("标签不能为空"); // } if (StrUtil.isEmpty(handleMethod)){ - throw new IllegalArgumentException("办理方法不能为空"); + throw new IllegalArgumentException("办理方式不能为空"); } if (CollectionUtil.isNotEmpty(involveProblemIdList)){ diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java index 1ee7c5f..574aa1f 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java @@ -88,6 +88,13 @@ public interface ComplaintCollectionService { */ Result forceTermination(ComplaintCollectionForceTerminationRequest request); + /** + * 办理页面保存:保存临时办理信息 + * @param request + * @return + */ + Result saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request); + /** * 初核反馈 * @param request diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java index e51e135..db0c813 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -5,10 +5,12 @@ import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Opt; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -105,6 +107,8 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic private final DataCaseVerifResourceService dataCaseVerifResourceService; private final NegativeProblemRelationService negativeProblemRelationService; private final MailResourceService mailResourceService; + + private final NegativeHistoryService negativeHistoryService; private static final DateTimeFormatter INITIAL_REVIEW_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); private static final int CHECK_LIMIT_DAYS = 4; @@ -589,6 +593,16 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic return res; } + @Override + public Result saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request) { + ComplaintCollectionUpdateParam updateParam = ComplaintCollectionTransfer.INSTANCE.JsonRequestToUpdateParam(request); + updateParam.setId(request.getComplaintId()); + updateParam.setUpdateBy(UserContextHolder.getCurrentUser().getUserName()); + updateParam.setUpdateTime(LocalDateTime.now()); + boolean updated = complaintCollectionResourceService.updateSelectiveById(updateParam); + return Result.success(updated); + } + @Override public Result initialReview(ComplaintCollectionInitialReviewRequest request) { @@ -610,9 +624,35 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic updateParam.setGwf2(LocalDateTime.now().format(INITIAL_REVIEW_FMT)); updateParam.setGwf3(initialReviewStatus); complaintCollectionResourceService.updateSelectiveById(updateParam); + saveInitialReviewHistory(complaintCollection, request); return Result.success(Boolean.TRUE); } + private void saveInitialReviewHistory(ComplaintCollection complaintCollection, ComplaintCollectionInitialReviewRequest request) { + if (StrUtil.isBlank(complaintCollection.getNegativeId())) { + return; + } + + NegativeHistory history = new NegativeHistory() + .setHistoryId(IdUtil.fastSimpleUUID()) + .setNegativeId(complaintCollection.getNegativeId()) + .setActionName("初核反馈") + .setCrtTime(LocalDateTime.now()) + .setDataJson(JSON.toJSONString(request)); + + try { + UserAuth user = UserContextHolder.getCurrentUser(); + history.setCrtUser(user.getUserId()) + .setCrtUserName(user.getUserName()) + .setCrtName(user.getNickName()) + .setDepartName(user.getDepartName()); + } catch (RuntimeException e) { + history.setCrtName("系统"); + } + + negativeHistoryService.save(history); + } + @Override public Result getComplaintCollectionDetail(ComplaintCollectionDetailRequest request) { // 1. 查询主表数据