Merge branch 'xjchen' into 'develop'

增加所属项目筛选20230726

See merge request !21

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -660,9 +660,21 @@ public class RiskPlanAppController extends BaseController {
      */
     @GetMapping("/inherent/getResponsibilityUnits")
     public R<List<RiskPlanInherentList>> getResponsibilityUnits(String unitName,String projectId) {
-        QueryWrapper<RiskPlanInherentList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("measures_dept_name").like("measures_dept_name",unitName).isNotNull("measures_dept_name").groupBy("measures_dept_name");
-        List<RiskPlanInherentList> list=riskPlanInherentListService.list(queryWrapper);
+
+        List<RiskPlanInherentList> list=new ArrayList<>();
+        QueryWrapper<RiskPlan> query = new QueryWrapper<>();
+        query.eq("project_id",projectId);
+        List<RiskPlan> listPlan=riskPlanService.list(query);
+        if (listPlan!=null&&listPlan.size() > 0) {
+            List<Long> listPlanIds=new ArrayList<>();
+            for (RiskPlan riskPlan : listPlan) {
+                listPlanIds.add(riskPlan.getId());
+            }
+            QueryWrapper<RiskPlanInherentList> queryWrapper = new QueryWrapper<>();
+            queryWrapper.select("measures_dept_name").in("plan_id",listPlanIds).like("measures_dept_name",unitName).isNotNull("measures_dept_name").groupBy("measures_dept_name");
+            list=riskPlanInherentListService.list(queryWrapper);
+        }
+
         return R.ok(list);
     }
 
@@ -671,9 +683,20 @@ public class RiskPlanAppController extends BaseController {
      */
     @GetMapping("/inherent/getResponsibilityPersons")
     public R<List<RiskPlanInherentList>> getResponsibilityPersons(String personName,String projectId) {
+
+        List<RiskPlanInherentList> list=new ArrayList<>();
+        QueryWrapper<RiskPlan> query = new QueryWrapper<>();
+        query.eq("project_id",projectId);
+        List<RiskPlan> listPlan=riskPlanService.list(query);
+        if (listPlan!=null&&listPlan.size() > 0) {
+            List<Long> listPlanIds=new ArrayList<>();
+            for (RiskPlan riskPlan : listPlan) {
+                listPlanIds.add(riskPlan.getId());
+            }
         QueryWrapper<RiskPlanInherentList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("measures_user_name","measures_user_phone").like("measures_user_name",personName).isNotNull("measures_user_name").groupBy("measures_user_name");
-        List<RiskPlanInherentList> list=riskPlanInherentListService.list(queryWrapper);
+        queryWrapper.select("measures_user_name","measures_user_phone").in("plan_id",listPlanIds).like("measures_user_name",personName).isNotNull("measures_user_name").groupBy("measures_user_name");
+         list=riskPlanInherentListService.list(queryWrapper);
+        }
         return R.ok(list);
     }
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntityClean;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +18,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @date 2023-06-26
  */
 @Data
-public class RiskPlan extends BaseEntity
+public class RiskPlan extends BaseEntityClean
 {
     private static final long serialVersionUID = 1L;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java

 package com.censoft.censoftrongtong.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.RiskPlan;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.*;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +16,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanMapper 
+public interface RiskPlanMapper extends BaseMapper<RiskPlan>
 {
     /**
      * 查询风险计划

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java

 package com.censoft.censoftrongtong.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
@@ -16,7 +18,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanService 
+public interface IRiskPlanService extends IService<RiskPlan>
 {
     /**
      * 查询风险计划

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
@@ -28,7 +29,7 @@ import javax.annotation.Resource;
  * @date 2023-06-26
  */
 @Service
-public class RiskPlanServiceImpl implements IRiskPlanService {
+public class RiskPlanServiceImpl extends ServiceImpl<RiskPlanMapper, RiskPlan> implements IRiskPlanService {
     @Autowired
     private RiskPlanMapper riskPlanMapper;