feat: 涉访涉诉流程初核办理

src/main/java/com/biutag/supervision/constants/AppConstants.java

@@ -34,4 +34,8 @@ public class AppConstants {
 
     public static final String JWPY_DEPART_NAME= "现场督察大队";
 
+
+    // 已办结
+    public static final String COMPLETED = "1";
+
 }

src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java

@@ -84,9 +84,9 @@ public class ComplaintCollectionController {
     }
 
 
-    @Operation(description = "办理页面保存：保存涉及人员/领导等JSON")
+    @Operation(description = "办理页面保存：初核反馈")
     @PostMapping("/saveInvolveJson")
-    public Result<Boolean> saveInvolveJson(@RequestBody ComplaintCollectionSaveInvolveJsonRequest request){
+    public Result<Boolean> saveInvolveJson(@RequestBody ComplaintCollectionInitialReviewSaveRequest request){
         return complaintCollectionService.saveInvolveJson(request);
     }
 

src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java

@@ -327,6 +327,8 @@ public class ApplyCompletionAction implements Action {
             complaintCollectionUpdateParam.setSecondDepartName(byId.getShortName());
         }
         complaintCollectionUpdateParam.setId(complaintCollection.getId());
+        complaintCollectionUpdateParam.setCompletionStatus(verifyData.getCompletionStatus());
+        complaintCollectionUpdateParam.setPublicRecognition(verifyData.getPublicRecognition());
         complaintCollectionResourceService.updateSelectiveById(complaintCollectionUpdateParam);
     }
 

src/main/java/com/biutag/supervision/flow/action/ConfirmationCompletionAction.java

@@ -5,15 +5,17 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.biutag.supervision.common.UserContextHolder;
+import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.enums.*;
+import com.biutag.supervision.mapper.ComplaintCollectionMapper;
 import com.biutag.supervision.pojo.dto.ActionDto;
 import com.biutag.supervision.pojo.dto.flow.ConfirmationCompletionData;
-import com.biutag.supervision.pojo.entity.Negative;
+import com.biutag.supervision.pojo.entity.*;
-import com.biutag.supervision.pojo.entity.NegativeApprove;
-import com.biutag.supervision.pojo.entity.NegativeScorePolice;
-import com.biutag.supervision.pojo.entity.NegativeWork;
 import com.biutag.supervision.pojo.model.UserAuth;
-import com.biutag.supervision.service.*;
+import com.biutag.supervision.service.NegativeApproveService;
+import com.biutag.supervision.service.NegativeScorePoliceService;
+import com.biutag.supervision.service.NegativeService;
+import com.biutag.supervision.service.NegativeWorkService;
 import com.biutag.supervision.util.TimeUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -37,6 +39,8 @@ public class ConfirmationCompletionAction implements Action {
 
     private final NegativeApproveService approveService;
 
+    private final ComplaintCollectionMapper complaintCollectionMapper;
+
     @Override
     public void next(ActionDto actionDto) {
         UserAuth user = UserContextHolder.getCurrentUser();
@@ -53,6 +57,8 @@ public class ConfirmationCompletionAction implements Action {
         updateNegative(negativeId, completionData);
 
         addNegativeScorePolice(negativeId, completionData);
+        // 更新涉访涉诉状态办理状态
+        updateComplaintCollectionStatus(negativeId);
     }
 
 
@@ -141,4 +147,9 @@ public class ConfirmationCompletionAction implements Action {
         workService.update(doneUpdateWrapper);
     }
 
+    // 更新为已办结
+    private void updateComplaintCollectionStatus(String negativeId) {
+        complaintCollectionMapper.update(new LambdaUpdateWrapper<ComplaintCollection>().eq(ComplaintCollection::getNegativeId, negativeId)
+                .set(ComplaintCollection::getStatus, AppConstants.COMPLETED));
+    }
 }

src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java

@@ -92,6 +92,12 @@ public class VerifyData {
     // 处分处理情况
     private String disciplinaryActionDesc;
 
+    // 办结情况
+    private String completionStatus;
+
+    // 群众认可
+    private String publicRecognition;
+
     @Setter
     @Getter
     public static class Blame {

src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionInitialReviewSaveRequest.java

@@ -0,0 +1,25 @@
+package com.biutag.supervision.pojo.request.complaintCollection;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Schema(description = "初核请求")
+public class ComplaintCollectionInitialReviewSaveRequest {
+
+    @Schema(description = "涉访涉诉编号id")
+    private String complaintId;
+
+    @Schema(description = "初核工作开展情况")
+    private String initWorkDes;
+
+    @Schema(description = "初核发现的问题及下步工作计划")
+    private String initProblemPlan;
+
+    @Schema(description = "初核结论")
+    private String initVerdict;
+
+}

src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java

@@ -84,7 +84,7 @@ public interface ComplaintCollectionService {
      * @param request
      * @return
      */
-    Result<Boolean> saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request);
+    Result<Boolean> saveInvolveJson(ComplaintCollectionInitialReviewSaveRequest request);
 
     /**
      * 初核反馈

src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

@@ -12,6 +12,7 @@ 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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.common.UserContextHolder;
@@ -559,13 +560,13 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
     }
 
     @Override
-    public Result<Boolean> saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request) {
+    public Result<Boolean> saveInvolveJson(ComplaintCollectionInitialReviewSaveRequest request) {
-        ComplaintCollectionUpdateParam updateParam = ComplaintCollectionTransfer.INSTANCE.JsonRequestToUpdateParam(request);
+        complaintCollectionMapper.update(new LambdaUpdateWrapper<ComplaintCollection>()
-        updateParam.setId(request.getComplaintId());
+                .eq(ComplaintCollection::getId, request.getComplaintId())
-        updateParam.setUpdateBy(UserContextHolder.getCurrentUser().getUserName());
+                .set(ComplaintCollection::getInitWorkDes, request.getInitWorkDes())
-        updateParam.setUpdateTime(LocalDateTime.now());
+                .set(ComplaintCollection::getInitProblemPlan, request.getInitProblemPlan())
-        boolean updated = complaintCollectionResourceService.updateSelectiveById(updateParam);
+                .set(ComplaintCollection::getInitVerdict, request.getInitVerdict()));
-        return Result.success(updated);
+        return Result.success();
     }