预处理模块：工单问题生成，主网有效监测时长计算，

过程监督模块：工单模块功能，其他模块的审核
2023-02-27 11:24:58 +08:00
parent 5915ed87ac
commit 338b659d94
58 changed files with 2932 additions and 57 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java
@@ -24,6 +24,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import java.util.List;
+
 /**
 * 电能质量问题
 * @author xiaoyao
@@ -213,14 +215,26 @@ public class ElectricityQualityIssuesController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
    }

-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
-    @PostMapping("/queryIssuesAndOrder")
-    @ApiOperation("查询问题及工单（当前部门下）")
-    @ApiImplicitParam(name = "orgNo", value = "部门id", required = true)
-    public HttpResult<IssueesAndOrderVO> queryIssuesAndOrder(@RequestParam("orgNo") String orgNo){
-        String methodDescribe = getMethodDescribe("queryIssuesAndOrder");
-        IssueesAndOrderVO issueesAndOrderVO =issuesService.queryIssuesAndOrder(orgNo);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, issueesAndOrderVO, methodDescribe);
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/checkPowerQuality")
+    @ApiOperation("电能质量问题审核")
+    @ApiImplicitParam(name = "electricityQualityCheckParam", value = "电能质量问题审核参数", required = true)
+    public HttpResult<Boolean> checkPowerQuality(@Validated @RequestBody ElectricityQualityCheckParam electricityQualityCheckParam){
+        String methodDescribe = getMethodDescribe("checkPowerQuality");
+
+        Boolean flag  = issuesService.checkPowerQuality (electricityQualityCheckParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    /*todo*/
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryCheckTrack")
+    @ApiOperation("历史审核记录查询")
+    @ApiImplicitParam(name = "powerQualityProblemNo", value = "历史审核记录查询参数", required = true)
+    public HttpResult<List<RStatElectricQualityProblemLogVO>> queryCheckTrack(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo){
+        String methodDescribe = getMethodDescribe("checkPowerQuality");
+
+        List<RStatElectricQualityProblemLogVO>  rStatElectricQualityProblemLogVOS  = issuesService.queryCheckTrack (powerQualityProblemNo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatElectricQualityProblemLogVOS, methodDescribe);
    }

 }
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java
@@ -92,7 +92,27 @@ public class LoadTypeUserManageController extends BaseController {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
        }
    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/checkLoadTypeUserI")
+    @ApiOperation("入网评估报告审核")
+    @ApiImplicitParam(name = "loadTypeUserCheckParam", value = "入网评估报告审核参数", required = true)
+    public HttpResult<Boolean> checkLoadTypeUserI(@Validated @RequestBody LoadTypeUserCheckParam loadTypeUserCheckParam){
+        String methodDescribe = getMethodDescribe("checkLoadTypeUserI");

+        Boolean flag  = loadTypeUserManageService.checkLoadTypeUserI (loadTypeUserCheckParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/checkLoadTypeUserA")
+    @ApiOperation("实测报告审核")
+    @ApiImplicitParam(name = "loadTypeUserCheckParam", value = "实测报告参数", required = true)
+    public HttpResult<Boolean> checkLoadTypeUserA(@Validated @RequestBody LoadTypeUserCheckParam loadTypeUserCheckParam){
+        String methodDescribe = getMethodDescribe("checkLoadTypeUserA");
+
+        Boolean flag  = loadTypeUserManageService.checkLoadTypeUserA (loadTypeUserCheckParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
    /**
     * 上传干扰源用户入网报告
     * @author qijian
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java
@@ -92,10 +92,21 @@ public class RGeneralSurveyPlanController extends BaseController {
    public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
        String methodDescribe = getMethodDescribe("queryPlanAudit");

-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()));
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/checkPlanAudit")
+    @ApiOperation("普测计划-审核")
+    @ApiImplicitParam(name = "rGeneralSurveyPlanChcekParm", value = "普测计划审核参数", required = true)
+    public HttpResult<Boolean> checkPlanAudit(@Validated @RequestBody RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm){
+        String methodDescribe = getMethodDescribe("checkPlanAudit");
+
+        Boolean flag  = rGeneralSurveyPlanPOService.checkPlanAudit (rGeneralSurveyPlanChcekParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/queryPlanResult")
    @ApiOperation("查询普测计划-结果页面")
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RStatWorkOrderController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RStatWorkOrderController.java
@@ -1,13 +1,18 @@
 package com.njcn.process.controller;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO;
+import com.njcn.process.pojo.param.RStatProblemAndWorkOrderParam;
 import com.njcn.process.pojo.vo.IssueesAndOrderVO;
 import com.njcn.process.pojo.vo.OrderCountVO;
+import com.njcn.process.pojo.vo.RStatDistributionProblemVO;
+import com.njcn.process.pojo.vo.RStatWorkOrderDetailVO;
 import com.njcn.process.service.RStatDistributionProblemService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -15,10 +20,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;

 /**
 * Description:
@@ -56,4 +61,58 @@ public class RStatWorkOrderController extends BaseController {
        OrderCountVO orderCountVO =rStatDistributionProblemService.queryOrderCount(orgNo);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, orderCountVO, methodDescribe);
    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/createProblem")
+    @ApiOperation("创建问题接口")
+    @ApiImplicitParam(name = "overLimitFlagDTOList", value = "部门id", required = true)
+    public HttpResult<Boolean> createProblem(@RequestBody List<OverLimitFlagDTO> overLimitFlagDTOList){
+        String methodDescribe = getMethodDescribe("createProblem");
+        Boolean problem = rStatDistributionProblemService.createProblem (overLimitFlagDTOList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, problem, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryProblem")
+    @ApiOperation("查询工单问题")
+    @ApiImplicitParam(name = "rStatProblemAndWorkOrderParam", value = "查询工单问题参数", required = true)
+    public HttpResult<IPage<RStatDistributionProblemVO>> queryProblem(@Validated @RequestBody RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam){
+        String methodDescribe = getMethodDescribe("queryProblem");
+
+        IPage<RStatDistributionProblemVO> rStatDistributionProblemVOIPage  = rStatDistributionProblemService.queryProblem (rStatProblemAndWorkOrderParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatDistributionProblemVOIPage, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/checkProblem")
+    @ApiOperation("审核处理")
+    @ApiImplicitParam(name = "rStatDistributionProblemVO", value = "审核工单问题参数", required = true)
+    public HttpResult<Boolean> checkProblem(@Validated @RequestBody RStatDistributionProblemVO rStatDistributionProblemVO){
+        String methodDescribe = getMethodDescribe("checkProblem");
+
+       Boolean flag  = rStatDistributionProblemService.checkProblem (rStatDistributionProblemVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryWorkOrder")
+    @ApiOperation("查询工单")
+    @ApiImplicitParam(name = "rStatProblemAndWorkOrderParam", value = "查询工单问题参数", required = true)
+    public HttpResult<IPage<RStatWorkOrderDetailVO>> queryWorkOrder(@Validated @RequestBody RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam){
+        String methodDescribe = getMethodDescribe("queryWorkOrder");
+
+        IPage<RStatWorkOrderDetailVO> rStatWorkOrderDetailVOIPage  = rStatDistributionProblemService.queryWorkOrder (rStatProblemAndWorkOrderParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatWorkOrderDetailVOIPage, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateWorkOrderStatus")
+    @ApiOperation("更新工单进度")
+    @ApiImplicitParam(name = "rStatWorkOrderDetailVO", value = "查询工单问题参数", required = true)
+    public HttpResult<Boolean> updateWorkOrderStatus(@Validated @RequestBody RStatWorkOrderDetailVO rStatWorkOrderDetailVO){
+        String methodDescribe = getMethodDescribe("updateWorkOrderStatus");
+
+        Boolean flag  = rStatDistributionProblemService.updateWorkOrderStatus (rStatWorkOrderDetailVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
 }