From b766e77c424d63e3a516ce5998e681849e302b63 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Tue, 27 Aug 2024 11:44:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=9C=B0=E5=9D=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E8=A7=A3=E5=86=B3=E6=8A=80=E6=9C=AF=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=E7=AE=A1=E7=90=86=E5=A1=AB=E6=8A=A5=E4=BA=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/UserReportRenewalController.java     |  2 +-
 .../survey/impl/SurveyPlanServiceImpl.java    |  5 ++--
 .../survey/impl/SurveyTestServiceImpl.java    | 27 +++++++++++++------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java
index 782967a61..650b8fbe6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java
@@ -30,7 +30,7 @@ import com.njcn.web.controller.BaseController;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("width = 30,height = 60Renewal")
+@RequestMapping("/userReportRenewal")
 @Api(tags = "干扰源常态化管理信息更新")
 public class UserReportRenewalController extends BaseController {
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
index f6c8b9a1f..214940346 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
@@ -235,8 +235,8 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
                         surveyTest.setInitiateWarningFlag(0);
                         surveyTest.setSubstation(subId);
                         surveyTest.setCustomSubstationFlag(0);
+                        surveyTest.setCreateBy("");
                         surveyTest.setStatus(FlowStatusEnum.NEW.getCode());
-                        surveyTest.setCreateBy(surveyPlan.getCreateBy());
                         surveyTestService.save(surveyTest);
                     }
                 }
@@ -248,7 +248,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
                 surveyTest.setInitiateWarningFlag(0);
                 surveyTest.setCustomSubstationFlag(1);
                 surveyTest.setStatus(FlowStatusEnum.NEW.getCode());
-                surveyTest.setCreateBy(surveyPlan.getCreateBy());
+                surveyTest.setCreateBy("");
                 surveyTestService.save(surveyTest);
             }
         }
@@ -258,7 +258,6 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SurveyPlanVO surveyPlanVO = this.getVOById(businessId);
-
         bpmInstanceInfo.setHistoryInstanceId(surveyPlanVO.getHistoryInstanceId());
         DictData data = dicDataFeignClient.getDicDataById(surveyPlanVO.getSupvType()).getData();
         String name = "未知监督类型";
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
index d991b5bdd..931640782 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
@@ -100,7 +100,6 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                                 )
                     );
 
-
             //根据工程名称模糊搜索
             if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
                 LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -116,16 +115,19 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                     return new Page<>();
                 }
             }
-            surveyTestVOQueryWrapper.in(CollUtil.isNotEmpty(deptIds), "supervision_survey_test.dept_id", deptIds);
-            if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
-                surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus());
-            }
+
+        }//筛选普测负责单位
+        if (StrUtil.isNotBlank(surveyTestQueryParam.getDeptIndex())) {
+            deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData();
+        }
+        surveyTestVOQueryWrapper.in(CollUtil.isNotEmpty(deptIds), "supervision_survey_test.dept_id", deptIds);
+        if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
+            surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus());
         }
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
         surveyTestVOQueryWrapper
                 .eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode())
                 .orderByDesc("supervision_survey_test.Update_Time");
-
         Page<SurveyTestVO> surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper);
         List<SurveyTestVO> records = surveyTestVOPage.getRecords();
         if (CollectionUtil.isNotEmpty(records)) {
@@ -261,11 +263,14 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyTest.getId());
         bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
-        String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyTest.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
         surveyTest.setProcessInstanceId(processInstanceId);
         //保存历史流程id列表
         surveyTest.setHistoryInstanceId(historyInstanceIds);
+        surveyTest.setCreateBy(RequestUtil.getUserIndex());
+        surveyTest.setUpdateBy(RequestUtil.getUserIndex());
+        surveyTest.setUpdateTime(LocalDateTimeUtil.now());
         this.baseMapper.updateById(surveyTest);
         return surveyTest.getId();
     }
@@ -295,6 +300,9 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SurveyTestVO surveyTestVO = this.getVOById(businessId);
+        if(Objects.isNull(surveyTestVO)){
+            return bpmInstanceInfo;
+        }
         bpmInstanceInfo.setHistoryInstanceId(surveyTestVO.getHistoryInstanceId());
         DictData data = dicDataFeignClient.getDicDataById(surveyTestVO.getSupvType()).getData();
         String name = "未知监督类型";
@@ -317,8 +325,11 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
 
     @Override
     public SurveyTestVO getVOById(String id) {
-        SurveyTest surveyTest = this.baseMapper.selectById(id);
         SurveyTestVO surveyTestVO = new SurveyTestVO();
+        SurveyTest surveyTest = this.baseMapper.selectById(id);
+        if(Objects.isNull(surveyTest)){
+            return null;
+        }
         BeanUtils.copyProperties(surveyTest, surveyTestVO);
         String planId = surveyTest.getPlanId();
         SurveyPlan surveyPlan = surveyPlanService.getById(planId);