Merge branch 'xjchen' into 'develop'

公司人员快捷查询和任务详情20230726

See merge request !20

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

@@ -3,8 +3,10 @@ package com.censoft.censoftrongtong.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.censoft.censoftrongtong.domain.LedgerProject;
 import com.censoft.censoftrongtong.service.ILedgerProjectService;
+import com.ruoyi.common.core.domain.R;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -102,4 +104,20 @@ public class LedgerProjectController extends BaseController
     {
         return toAjax(ledgerProjectService.deleteLedgerProjectByIds(ids));
     }
+
+    /**
+     * 查询项目列表
+     * @param projectName
+     * @return
+     */
+    @GetMapping("/listByQuery/{projectName}")
+    public R<List<LedgerProject>> listByQuery(@PathVariable String  projectName)
+    {
+        QueryWrapper<LedgerProject> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("name","id").lambda().like(LedgerProject::getName,projectName);
+        List<LedgerProject> list = ledgerProjectService.list(queryWrapper);
+        return R.ok(list);
+    }
+
+
 }

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

 package com.censoft.censoftrongtong.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.censoft.censoftrongtong.domain.*;
 import com.censoft.censoftrongtong.domain.dto.*;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
@@ -26,6 +27,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -652,4 +654,27 @@ public class RiskPlanAppController extends BaseController {
         });
         return R.ok(list);
     }
+
+    /**
+     *返回责单位列表
+     */
+    @GetMapping("/inherent/getResponsibilityUnits/{unitName}")
+    public R<List<RiskPlanInherentList>> getResponsibilityUnits(@PathVariable String unitName) {
+        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);
+        return R.ok(list);
+    }
+
+    /**
+     *返回责单位列表
+     */
+    @GetMapping("/inherent/getResponsibilityPersons/{personName}")
+    public R<List<RiskPlanInherentList>> getResponsibilityPersons(@PathVariable String personName) {
+        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);
+        return R.ok(list);
+    }
+
 }

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

 package com.censoft.censoftrongtong.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.LedgerProject;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 
 import java.util.List;
 
@@ -10,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerProjectMapper 
+public interface LedgerProjectMapper  extends BaseMapper<LedgerProject>
 {
     /**
      * 查询基础数据-项目

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

 package com.censoft.censoftrongtong.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerProject;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 import java.util.List;
@@ -11,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerProjectService 
+public interface ILedgerProjectService extends IService<LedgerProject>
 {
     /**
      * 查询基础数据-项目

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

@@ -2,8 +2,11 @@ package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerProject;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.mapper.LedgerProjectMapper;
+import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
 import com.censoft.censoftrongtong.service.ILedgerProjectService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -21,7 +24,7 @@ import javax.annotation.Resource;
  * @date 2023-06-26
  */
 @Service
-public class LedgerProjectServiceImpl implements ILedgerProjectService
+public class LedgerProjectServiceImpl extends ServiceImpl<LedgerProjectMapper, LedgerProject> implements ILedgerProjectService
 {
     @Autowired
     private LedgerProjectMapper ledgerProjectMapper;

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sd2.dept_name AS deptName,
         lp.city,
         rp.building_ids AS buildingIds,
-        ( SELECT GROUP_CONCAT( `name` ) FROM ledger_building WHERE project_id = lp.id ) AS buildingNames,
+        ( SELECT GROUP_CONCAT( `name` ) FROM ledger_building WHERE FIND_IN_SET( id, rp.building_ids ) ) AS buildingNames,
         su2.user_id AS leaderUserId,
         su2.nick_name AS leaderUserName,
         rp.work_user_ids AS workUserIds,