技术监督管理

pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvMonthStatisController.java

@@ -1,5 +1,6 @@
 package com.njcn.process.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,7 +8,10 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.process.pojo.param.SupvPlanParam;
+import com.njcn.process.pojo.po.SupvReportM;
+import com.njcn.process.service.ISupvReportMService;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.time.LocalDate;
+
 /**
  * pqs
  * 月度统计
@@ -30,14 +36,37 @@ import springfox.documentation.annotations.ApiIgnore;
 @RequiredArgsConstructor
 public class SupvMonthStatisController extends BaseController {
 
+    private final ISupvReportMService iSupvReportMService;
 
+
+    /**
+     *
+     * @author cdf
+     * @date 2023/6/27
+     */
     @PostMapping("statisticReport")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-    @ApiIgnore
-    public HttpResult<Object> statisticReport(@RequestBody @Validated SupvPlanParam supvPlanParam){
+    @ApiOperation("监督月报统计")
+    public HttpResult<Object> statisticReport(@RequestParam("timeId")String timeId){
         String methodDescribe = getMethodDescribe("statisticReport");
 
-        
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        LocalDate localDate = LocalDate.parse(timeId);
+
+        boolean flag = iSupvReportMService.statisticSuperviseReport(localDate);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    /**
+     * 查询阅读监督报告
+     * @author cdf
+     * @date 2023/6/27
+     */
+    @PostMapping("statisticReportPage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询监督月报")
+    public HttpResult<Page<SupvReportM>> statisticReportPage(BaseParam baseParam){
+        String methodDescribe = getMethodDescribe("statisticReportPage");
+        Page<SupvReportM> page = iSupvReportMService.statisticReportPage(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 }

pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvProblemController.java

@@ -13,6 +13,9 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.process.pojo.param.SupvProblemParam;
 import com.njcn.process.pojo.po.SupvProblem;
 import com.njcn.process.service.ISupvProblemService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -26,6 +29,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -44,6 +50,8 @@ public class SupvProblemController extends BaseController {
     private final ISupvProblemService iSupvProblemService;
 
 
+
+
     @PostMapping("addProblem")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     @ApiOperation("新增技术监督问题")
@@ -84,6 +92,7 @@ public class SupvProblemController extends BaseController {
             throw new BusinessException("监督计划索引不可为空");
         }
         Page<SupvProblem> page = iSupvProblemService.pageProblem(supvProblemParam);
+
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 }