通过部门id,甲方单位id获取分管领导

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcManageDeptController.java

@@ -2,6 +2,10 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcPartyAService;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +37,12 @@ public class CmcManageDeptController extends BaseController
     @Autowired
     private ICmcManageDeptService cmcManageDeptService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ICmcPartyAService partyAService;
+
     /**
      * 查询cmc领导分管列表
      */
@@ -41,6 +51,22 @@ public class CmcManageDeptController extends BaseController
     {
         startPage();
         List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
+        for (CmcManageDept manageDept : list) {
+            String deptId = manageDept.getDeptId();
+            StringBuilder deptName = new StringBuilder();
+            if (deptId != null && !deptId.equals("") && deptId.split(",").length > 0) {
+                for (String dept : deptId.split(","))
+                    deptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+                manageDept.setDeptName(deptName.substring(0, deptName.length() - 1));
+            }
+            String partyAId = manageDept.getPartyAId();
+            StringBuilder partyAName = new StringBuilder();
+            if (partyAId != null && !partyAId.equals("") && partyAId.split(",").length > 0) {
+                for (String partyA : partyAId.split(","))
+                    partyAName.append(partyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
+                manageDept.setPartyAName(partyAName.substring(0, partyAName.length() - 1));
+            }
+        }
         return getDataTable(list);
     }
 
@@ -52,6 +78,22 @@ public class CmcManageDeptController extends BaseController
     public void export(HttpServletResponse response, CmcManageDept cmcManageDept)
     {
         List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
+        for (CmcManageDept manageDept : list) {
+            String deptId = manageDept.getDeptId();
+            StringBuilder deptName = new StringBuilder();
+            if (deptId != null && !deptId.equals("") && deptId.split(",").length > 0) {
+                for (String dept : deptId.split(","))
+                    deptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+                manageDept.setDeptName(deptName.substring(0, deptName.length() - 1));
+            }
+            String partyAId = manageDept.getPartyAId();
+            StringBuilder partyAName = new StringBuilder();
+            if (partyAId != null && !partyAId.equals("") && partyAId.split(",").length > 0) {
+                for (String partyA : partyAId.split(","))
+                    partyAName.append(partyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
+                manageDept.setPartyAName(partyAName.substring(0, partyAName.length() - 1));
+            }
+        }
         ExcelUtil<CmcManageDept> util = new ExcelUtil<CmcManageDept>(CmcManageDept.class);
         util.exportExcel(response, list, "cmc领导分管数据");
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.oa.domain.CmcManageDept;
+import com.ruoyi.oa.service.ICmcManageDeptService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +48,9 @@ public class SysPostController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ICmcManageDeptService cmcManageDeptService;
+
     /**
      * 获取岗位列表
      */
@@ -145,7 +150,7 @@ public class SysPostController extends BaseController
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId()));
+        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId().toString(), ""));
     }
 
     /**
@@ -161,9 +166,9 @@ public class SysPostController extends BaseController
      * 通过deptId获取分管领导
      */
     @GetMapping("/manageLeaderByDept")
-    public AjaxResult getManageLeaderByDeptId(String deptId)
+    public AjaxResult getManageLeaderByDeptId(String deptId, String partyAId)
     {
-        return success(getManageId(Long.parseLong(deptId)));
+        return success(getManageId(deptId, partyAId));
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@@ -247,26 +252,14 @@ public class SysPostController extends BaseController
         return success(posts);
     }
 
-    private SysUser getManageId(Long id) {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("2", Arrays.asList(104,106,114));
-        jsonObject.put("7", Arrays.asList(105, 113, 117));
-        jsonObject.put("9", Arrays.asList(109, 110));
-        jsonObject.put("10", Arrays.asList(111, 112));
-        jsonObject.put("11", Arrays.asList(107, 108));
-        jsonObject.put("12", Arrays.asList(118));
-        jsonObject.put("13", Arrays.asList(115, 116));
-        Iterator<String> iterator = jsonObject.keySet().iterator();
-        String manageId = "";
-        while(iterator.hasNext()){
-            String key = (String) iterator.next();
-            List<Long> value = jsonObject.getList(key, Long.class);
-            if (value.contains(id))
-                manageId = key;
+    private List<SysUser> getManageId(String deptId, String partyAId) {
+        List<SysUser> userList = new ArrayList<>();
+        CmcManageDept cmcManageDept = new CmcManageDept();
+        cmcManageDept.setDeptId(deptId);
+        cmcManageDept.setPartyAId(partyAId);
+        for (CmcManageDept manageDept : cmcManageDeptService.selectCmcManageDeptList(cmcManageDept)) {
+            userList.add(userService.selectUserById(manageDept.getUserId()));
         }
-        SysUser user = new SysUser();
-        if (!manageId.equals(""))
-            user = userService.selectUserById(Long.parseLong(manageId));
-        return user;
+        return userList;
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcManageDept.java

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -17,12 +18,19 @@ public class CmcManageDept extends BaseEntity
 
     /** 分管领导id */
     private Long userId;
+    @Excel(name = "分管领导")
+    private String userName;
+    private SysUser user;
 
     /** 分管部门id */
-    private Long deptId;
+    private String deptId;
+    @Excel(name = "分管部门")
+    private String deptName;
 
     /** 院内对接单位 */
     private String partyAId;
+    @Excel(name = "院内对接单位")
+    private String partyAName;
 
     public void setUserId(Long userId) 
     {
@@ -33,15 +41,34 @@ public class CmcManageDept extends BaseEntity
     {
         return userId;
     }
-    public void setDeptId(Long deptId) 
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.userName = user == null ? "" : user.getNickName();
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
     public void setPartyAId(String partyAId) 
     {
         this.partyAId = partyAId;
@@ -51,6 +78,15 @@ public class CmcManageDept extends BaseEntity
     {
         return partyAId;
     }
+    public void setPartyAName(String partyAName)
+    {
+        this.partyAName = partyAName;
+    }
+
+    public String getPartyAName()
+    {
+        return partyAName;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -105,8 +105,8 @@
         <where>
             <if test="applier != null "> and ca.applier = #{applier}</if>
             <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
-            <if test="cars != null  and cars != ''"> and find_in_set(ca.cars, #{cars})</if>
-            <if test="drivers != null  and drivers != ''"> and find_in_set(ca.drivers, #{drivers})</if>
+            <if test="cars != null  and cars != ''"> and find_in_set(#{cars}, ca.cars)</if>
+            <if test="drivers != null  and drivers != ''"> and find_in_set(#{drivers}, ca.drivers})</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -75,9 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="applier != null "> and da.applier = #{applier}</if>
             <if test="useDept != null "> and da.use_dept = #{useDept}</if>
-            <if test="devices != null  and devices != ''"> and find_in_set(da.devices, #{devices})</if>
-            <if test="modifyDevices != null  and modifyDevices != ''"> and find_in_set(da.modify_devices, #{modifyDevices})</if>
-            <if test="repairDevices != null  and repairDevices != ''"> and find_in_set(da.repair_devices, #{repairDevices})</if>
+            <if test="devices != null  and devices != ''"> and find_in_set(#{devices}, da.devices)</if>
+            <if test="modifyDevices != null  and modifyDevices != ''"> and find_in_set(#{modifyDevices}, da.modify_devices)</if>
+            <if test="repairDevices != null  and repairDevices != ''"> and find_in_set(#{repairDevices}, da.repair_devices)</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcManageDeptMapper.xml

@@ -8,21 +8,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="partyAId"    column="party_a_id"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectCmcManageDeptVo">
-        select user_id, dept_id, party_a_id from cmc_manage_dept
+        select md.user_id, u.nick_name as nick_name, md.dept_id, md.party_a_id from cmc_manage_dept as md
+        left join sys_user as u on u.user_id = md.user_id
     </sql>
 
     <select id="selectCmcManageDeptList" parameterType="CmcManageDept" resultMap="CmcManageDeptResult">
         <include refid="selectCmcManageDeptVo"/>
-        <where>  
+        <where>
+            <if test="deptId != null  and deptId != ''"> and find_in_set(#{deptId}, md.dept_id)</if>
+            <if test="partyAId != null  and partyAId != ''"> and find_in_set(#{partyAId}, md.party_a_id)</if>
         </where>
     </select>
     
     <select id="selectCmcManageDeptByUserId" parameterType="Long" resultMap="CmcManageDeptResult">
         <include refid="selectCmcManageDeptVo"/>
-        where user_id = #{userId}
+        where md.user_id = #{userId}
     </select>
         
     <insert id="insertCmcManageDept" parameterType="CmcManageDept">
@@ -42,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateCmcManageDept" parameterType="CmcManageDept">
         update cmc_manage_dept
         <trim prefix="SET" suffixOverrides=",">
-            <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="partyAId != null">party_a_id = #{partyAId},</if>
+            <if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
+            party_a_id = #{partyAId}
         </trim>
         where user_id = #{userId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeReportMapper.xml

@@ -38,7 +38,7 @@
         <where>
             <if test="projectId != null  and projectId != ''"> and sr.project_id = #{projectId}</if>
             <if test="reportDate != null "> and sr.report_date = #{reportDate}</if>
-            <if test="member != null  and member != ''"> and (find_in_set(sr.member, #{member}) or sr.reporter = #{member})</if>
+            <if test="member != null  and member != ''"> and (find_in_set(#{member}, sr.member) or sr.reporter = #{member})</if>
             <if test="employee != null  and employee != ''"> and sr.employee like concat('%', #{employee}, '%')</if>
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -118,13 +118,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.degree = #{degree}
 		</if>
 		<if test="titles != null and titles != ''">
-			AND find_in_set(u.titles, #{titles})
+			AND find_in_set(#{titles}, u.titles)
 		</if>
 		<if test="certificates != null and certificates != ''">
-			AND find_in_set(u.certificates, #{certificates})
+			AND find_in_set(#{certificates}, u.certificates})
 		</if>
 		<if test="politicalAffiliation != null and politicalAffiliation != ''">
-			AND find_in_set(u.political_affiliation, #{political_affiliation})
+			AND find_in_set(#{politicalAffiliation}, u.political_affiliation})
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')

oa-back/sql/sql.sql

@@ -99,7 +99,7 @@ create table sys_user (
 -- ----------------------------
 -- 初始化-用户信息表数据
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 104, 'admin', 'admin', '0', NULL, '15888888888', '1', NULL, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-07-02 14:56:55', NULL, '2024-05-14 10:41:32', NULL, '2024-07-02 14:56:54', '管理员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_user` VALUES (1, 108, 'admin', '管理员', '0', NULL, '15888888888', '1', NULL, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-07-02 14:56:55', NULL, '2024-05-14 10:41:32', NULL, '2024-07-02 14:56:54', '管理员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `sys_user` VALUES (2, 101, '13982275233', '刘光庆', '0', NULL, '13982275233', '0', NULL, '$2a$10$uO4FSr6sf1mOe0jO6tKNROwwaw4cApBZwxQE22Vyy5PjuFxpzbdwu', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, NULL, NULL, NULL, '1', NULL, NULL, '7', '5', NULL, '1991-07-15', NULL, NULL, NULL, '420111197010024095', '重庆市彭水县', '10', '汉族', '武汉大学', '测绘工程', '2', '2016-01-01', NULL, '成都市青羊区光华街道清江中路65号香格里拉花园');
 INSERT INTO `sys_user` VALUES (3, 101, '13808211356', '向发廷', '0', NULL, '13808211356', '0', NULL, '$2a$10$BueA2DCg.vdjxXPTrEl4A.sUwY1m3AqNbIext6Ow9hGdy4JRTzrC.', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, NULL, NULL, NULL, '0', NULL, NULL, NULL, NULL, NULL, '1984-02-13', NULL, NULL, NULL, '519003196309166135', '四川省南部县', '2,9', '汉族', '武汉测绘科技大学', '工程测量', '2', '2016-01-01', NULL, '成都市青羊区清江东路186号');
 INSERT INTO `sys_user` VALUES (4, 101, '13608089391', '王渊', '0', NULL, '13608089391', '0', NULL, '$2a$10$5Urhp6ssSwmN/F3dt3p3XOC9EqY.8JKWDzSEJjjyT.dIqLbqzqNUu', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, NULL, NULL, NULL, '0', NULL, NULL, '6', '6', NULL, '1985-12-25', NULL, NULL, NULL, '510103196508013470', '四川省三台县', '0,10', '汉族', '武汉测绘科技大学', '摄影测量与遥感', '2', '2016-01-01', NULL, '成都市青羊区清江东路186号');
@@ -1740,8 +1740,8 @@ create table sys_notice (
 -- ----------------------------
 -- 初始化-公告信息表数据
 -- ----------------------------
-insert into sys_notice values('1', '温馨提醒：2024-06-24 综合办公系统公开测试版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员');
-insert into sys_notice values('2', '维护通知：2024-06-24 综合办公系统在试用期间将不定期维护更新', '1', '维护内容',   '0', 'admin', sysdate(), '', null, '管理员');
+insert into sys_notice values('1', '温馨提醒：2024-06-24 综合办公系统公开测试版本发布啦', '2', '新版本内容', '0', '管理员', sysdate(), '', null, '管理员');
+insert into sys_notice values('2', '维护通知：2024-06-24 综合办公系统在试用期间将不定期维护更新', '1', '维护内容',   '0', '管理员', sysdate(), '', null, '管理员');
 
 
 -- ----------------------------
@@ -8439,7 +8439,7 @@ INSERT INTO `cmc_technical` VALUES ('1648881410631270444', '1648881410631270444'
 INSERT INTO `cmc_technical` VALUES ('1648881410631270449', '1648881410631270449', NULL, 49, NULL, NULL, NULL, NULL, '2024-06-06', NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410631270452', '1648881410631270452', NULL, 49, NULL, NULL, '按技术交底执行', NULL, '2024-01-15', NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410631270463', '1648881410631270463', 72, 46, '1）本项目主要执行的规程规范或其他技术文件\n（1）《水电工程测量规范》NB/T 35029-2023； \n（2）《测绘成果质量检查与验收》GB/T 24356-2023。\n2）主要技术指标及成果要求\n（1）平面坐标系统：2000国家大地坐标系；高程系统：1985国家高程基准。\n（2）断面基点测量按照五等平面精度。\n（3）断面测量按《水电工程测量规范》执行。\n（4）流量测验满足用户需求。\n3）使用的仪器设备及专业应用软件\n使用仪器为全站仪、GNSS接收机、无人测量船、流速仪；内业处理软件为浩辰CAD、南方CASS等。所用仪器在投入工程前均检定合格，并在检定有效期内。 \n4）作业方法\n（1）断面位置按用户设计图施测，断面基点平面五等，做单基点。采集CORS信号，高程通过测绘局转换；建立测区高程转换模型。\n（2）岸上断面现场实测，水下断面点采用无人船测量。\n（3）流量测验以用户要求为准。\n5）上交成果资料\n（1）断面成果、基点成果。\n（2）流量测验成果。\n（3）技术设计书及测量报告等（电子版及纸质资料）。\n（4）其它资料见技术设计书。', NULL, '按技术交底要求作业。', '同意', '2024-05-12', '2024-05-12');
-INSERT INTO `cmc_technical` VALUES ('1648881410631270465', '1648881410631270465', 71, 59, NULL, NULL, '', '按技术要求进行作业', '2024-06-20', '2024-06-20');
+INSERT INTO `cmc_technical` VALUES ('1648881410631270465', '1648881410631270465', 71, 49, NULL, NULL, '', '按技术要求进行作业', '2024-06-20', '2024-06-20');
 INSERT INTO `cmc_technical` VALUES ('1648881410694184962', '1648881410694184962', 32, 46, '1) 本项目执行的规程规范或其他技术文件\n（1）《水电工程测量规范》NB/T 35029-2014；\n（2）《水电工程三维激光扫描测量规程》NB/T 35109-2018；《机载激光雷达数据获取技术规范》CH/T 8024-2011；《机载激光雷达数据处理技术规范》CH/T 8023-2011；\n（3）《国家基本比例尺地图图式第1部分：1:500 1:1000 1:2000地形图图式》GB/T 20257.1-2017；《国家基本比例尺地图图式第2部分：1:5000 1:10000地形图图式》GB/T 20257.2-2017；\n（4）《测绘成果质量检查与验收》GB/T 24356-2009；《数字测绘成果质量检查与验收》GB/T 18316-2008。\n2) 主要技术指标及成果要求\n平面坐标系统：2000国家大地坐标系；\n高程系统：1985国家高程基准。\n（1）五等控制点点位中误差大不于5cm，边长相对中误差小于1/20000，高程分别以相邻控制点内部联测，闭合差小于20 mm。\n（2）1:2000地形图采用2.0m等高距，地形类别为山地。地物点平面位置中误差（图上）≤±0.8mm；图幅等高线高程中误差≤±2h/3、高程注记点中误差≤±h/3，h为等高距。\n（3）1:5000地形图采用5.0m等高距，地形类别为山地。地物点平面位置中误差（图上）≤±0.75mm；图幅等高线高程中误差≤±2h/3、高程注记点中误差≤±h/3，h为等高距。\n（4）三维激光扫描采集的激光点云应分布均匀，统一按1:2000精度采集，激光点云地面点密度应大于1点/m2；航空影像分辨率优于0.2m。\n3) 使用的仪器设备及专业应用软件\n使用仪器为飞马DV-LiDAR22激光雷达系统一套，飞行平台采用飞马D20旋翼无人机；拓普康全站仪1台；中海达GNSS接收机2台；内业处理软件为CoPre和TerraSolid 9.0、浩辰CAD、南方CASS等。所用仪器在投入工程前均由测绘管理部门检定合格，并在检定有效期内。\n4) 作业方法\n（1）地形图外业采用无人机搭载激光雷达地面扫描和航空摄影采集地面数据。\n（2）内业通过点云处理，生成DEM构等高线。生产DOM采集地物，最后将地物与等高线套合编辑，出地形图成果。\n（3）外业采用电子调绘系统进行现场调绘工作。\n（4）外业采用常规全站仪、GNSS-RTK进行打点检查；地形图检查点应覆盖不同的航摄分区及结合处，不同的高程面，包括重要工程部位。\n（5）内业将外业调绘、修补测等成果进行编辑，形成正式地形图。\n注：1、点云解算前应通过外业测点检查成果质量；\n2、首件产品应及时提交技术质量部检查。\n5) 上交成果资料\n（1）1:2000地形图、1:5000地形图。\n（2）航测采集成果、数据处理成果资料。\n（3）测绘作业计划及测量报告等。\n（4）其它资料见测绘作业计划。', NULL, '按技术交底要求作业。', '按技术交底要求进行作业。', '2023-03-22', '2023-03-22');
 INSERT INTO `cmc_technical` VALUES ('1648881410878734337', '1648881410878734337', 61, 55, NULL, NULL, '按照要求执行，如现场实施方案有变，及时反馈。 ', '已接受技术交底，现场按要求开展作业。', '2023-03-01', '2023-08-07');
 INSERT INTO `cmc_technical` VALUES ('1648881411067478017', '1648881411067478017', 61, 46, '1）本项目执行的规程规范、技术文件\n（1）《水电工程测量规范》NB/T 35029-2014；\n（3）《水文测量规范》SLS8-2014；\n（4）《水库水文泥沙观测规范》（SL 339-2006）；\n（5）《测绘成果质量检查与验收》GB/T 24356-2009；\n（6）《数字测绘成果质量检查与验收》GB/T 18316-2008。\n2）主要技术指标及成果要求\n（1）平面坐标系统：雅砻江坐标系；高程系统：1985国家高程基准。\n（2）控制点平面采用二等、三等GNSS测量，高程采用三等三角高程测量；\n二等GNSS相邻点平均边长大不于13km，相应等级控制网的固定和比例误差为10mm及2mm/km，最弱相邻点边长相对中误差小于1/150000。\n三等GNSS平均边长4km～8km，相应等级控制网的固定和比例误差10mm及5mm/km，最弱边相对中误差小于1/80000。\n三等电磁波测距三角高程测量每条边对向观测高差之较差不超过±35√D，附（闭）合路线闭合差不大于±12√D，单程双测高差较差不大于±8√D，单位mm。其中D为水平距离，单位km。\n（3）断面基点高程为四等高程、平面为五等。\n（4）断面点密度（测点间距）按1:1000地形测量规范要求进行测定，断面点间距5～10m，最大点间距不大于15m，水下测点应不少于5点。对水深变化大的区域适当加密测点，尽可能测量到地形变化的特征点。\n3）使用的仪器设备及专业应用软件\n全站仪、GNSS接收机、全数字双变频测深仪、无人测量船S-11、南方CASS10.1、航天远景。所用仪器在投入工程前均由测绘管理部门检定合格，并在检定有效期内。\n4）作业方法\n（1）控制点平面采用二等、三等GNSS测量，高程采用三等三角高程测量；平面起算搜集测区附近国家点进行联测，高程控制联测两河口施工控制网成果，同时联测测区附近国家高程点校核；\n（2）断面基点高程采用四等三角高程测量、平面采用采用GNSS-RTK进行定位，也可采用五等导线测量、GNSS静态控制测量方法获取平面位置；\n（3）断面测量分为岸上部分和水下部分，岸上部分采用GNSS-RTK、全站仪等方式完成，高程测至水库正常蓄水位2865m以上，水下部分采用机动船搭载全数字双变频测深仪完成库区平水段水深测量，库尾自然河段采用无人测量船完成测量，横断面线需要垂直河道。点间距5~15m。\n4）上交成果资料\n（1）控制点成果表、断面基点成果表、断面累距成果表、横断面布置图等。\n（3）测绘作业计划及测量报告等。\n（4）其它资料见测绘作业计划。', NULL, '按技术交底要求作业。', '技术交底已完成，按要求开展作业。', '2023-02-28', '2023-02-28');
@@ -12525,46 +12525,23 @@ create table `cmc_safe_report`  (
 -- ----------------------------
 drop table if exists `cmc_manage_dept`;
 create table `cmc_manage_dept`  (
-  `user_id` 	bigint not null comment '分管领导id',
-  `dept_id` 	bigint not null comment '分管部门id',
-  `party_a_id` char(4) not null comment '院内对接单位',
-  primary key (`user_id`, `dept_id`, `party_a_id`)
+  `user_id` 	bigint 		not null comment '分管领导id',
+  `dept_id` 	varchar(20) default null comment '分管部门id',
+  `party_a_id`	varchar(25) default null comment '院内对接单位',
+  primary key (`user_id`)
 ) engine = innodb comment = 'cmc领导分管表';
 
 -- ----------------------------
 -- 初始化-领导分管表数据
 -- ----------------------------
-INSERT INTO `cmc_manage_dept` VALUES (2, 104, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (2, 106, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (2, 113, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (7, 104, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (7, 109, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (9, 108, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (9, 109, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (10, 0, '0230');
-INSERT INTO `cmc_manage_dept` VALUES (10, 0, '0231');
-INSERT INTO `cmc_manage_dept` VALUES (10, 0, '0232');
-INSERT INTO `cmc_manage_dept` VALUES (10, 0, '0233');
-INSERT INTO `cmc_manage_dept` VALUES (10, 111, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (10, 115, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (11, 0, '0227');
-INSERT INTO `cmc_manage_dept` VALUES (11, 0, '0235');
-INSERT INTO `cmc_manage_dept` VALUES (11, 107, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (11, 110, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (12, 116, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (13, 0, '0226');
-INSERT INTO `cmc_manage_dept` VALUES (13, 0, '0230');
-INSERT INTO `cmc_manage_dept` VALUES (13, 0, '0231');
-INSERT INTO `cmc_manage_dept` VALUES (13, 0, '0232');
-INSERT INTO `cmc_manage_dept` VALUES (13, 0, '0236');
-INSERT INTO `cmc_manage_dept` VALUES (13, 105, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (13, 112, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (13, 113, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (13, 114, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (14, 106, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (15, 105, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (15, 117, '0000');
-INSERT INTO `cmc_manage_dept` VALUES (15, 118, '0000');
+INSERT INTO `cmc_manage_dept` VALUES (2, '104,106,113', null);
+INSERT INTO `cmc_manage_dept` VALUES (7, '104,109', null);
+INSERT INTO `cmc_manage_dept` VALUES (9, '108,109', null);
+INSERT INTO `cmc_manage_dept` VALUES (10, '111,115', '0230,0231,0232,0233');
+INSERT INTO `cmc_manage_dept` VALUES (11, '107,110,116', '0227,0235');
+INSERT INTO `cmc_manage_dept` VALUES (13, '105,112,113,114', '0226,0230,0231,0232,0236');
+INSERT INTO `cmc_manage_dept` VALUES (14, '106', null);
+INSERT INTO `cmc_manage_dept` VALUES (15, '105,117,118', null);
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

oa-ui/src/views/oa/manage/index.vue

@@ -9,86 +9,66 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:manageDept:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:manage:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:manageDept:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:manage:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:manageDept:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:manage:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:manageDept:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:manage:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="manageDeptList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="分管领导id" align="center" prop="userId" />
-      <el-table-column label="分管部门id" align="center" prop="deptId" />
-      <el-table-column label="院内对接单位" align="center" prop="partyAId" />
+      <el-table-column type="index" width="50" />
+      <el-table-column label="分管领导" align="center" prop="user.nickName" />
+      <el-table-column label="分管部门" align="center" prop="deptName" />
+      <el-table-column label="院内对接单位" align="center" prop="partyAName" width="600px" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:manageDept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:manageDept:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:manage:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:manage:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc领导分管对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="分管领导" prop="userId">
+          <el-select v-model="form.userId" filterable clearable style="width:220px" :disabled="isSelect">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.userId > 0">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分管部门" prop="deptId">
+          <el-select v-model="form.deptId" filterable multiple clearable style="width:100%;">
+            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
+              v-if="item.deptId > 103 && item.deptId < 200">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院内对接单位" prop="partyAId">
+          <el-select v-model="form.partyAId" filterable multiple clearable style="width:100%;">
+            <el-option v-for="item in partyAList" :key="item.partyAId" :label="item.partyAName" :value="item.partyAId"
+              v-if="item.partyAName.startsWith('中国电建集团成都')">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -100,6 +80,7 @@
 
 <script>
 import { listManageDept, getManageDept, delManageDept, addManageDept, updateManageDept } from "@/api/oa/manage/manageDept";
+import { listPartyA } from "@/api/oa/partyA/partyA";
 
 export default {
   name: "ManageDept",
@@ -119,10 +100,15 @@ export default {
       total: 0,
       // cmc领导分管表格数据
       manageDeptList: [],
+      userList: [],
+      deptList: [],
+      partyAList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      isSelect: false,
+      isAdd: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -132,11 +118,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "分管部门不能为空", trigger: "change" }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.getUserList();
+    this.getDeptList();
+    this.getPartyAList();
   },
   methods: {
     /** 查询cmc领导分管列表 */
@@ -148,9 +140,25 @@ export default {
         this.loading = false;
       });
     },
+    // 查询用户列表
+    getUserList() {
+      this.userList = this.$store.state.user.userList;
+    },
+    // 查询部门列表
+    getDeptList() {
+      this.deptList = this.$store.state.user.deptList;
+    },
+    // 查询甲方单位列表
+    getPartyAList() {
+      listPartyA({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.partyAList = res.rows
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
+      this.isSelect = false;
+      this.isAdd = false;
       this.reset();
     },
     // 表单重置
@@ -175,14 +183,16 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.userId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.isAdd = true;
+      this.isSelect = false;
       this.open = true;
-      this.title = "添加cmc领导分管";
+      this.title = "添加领导分管";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -190,39 +200,71 @@ export default {
       const userId = row.userId || this.ids
       getManageDept(userId).then(response => {
         this.form = response.data;
+        if (this.form.deptId) {
+          let deptId = [];
+          for (let dept of this.form.deptId.split(',')) {
+            deptId.push(Number(dept));
+          }
+          this.form.deptId = deptId;
+        }
+        if (this.form.partyAId) {
+          let partyAId = [];
+          for (let partyA of this.form.partyAId.split(',')) {
+            partyAId.push(partyA);
+          }
+          this.form.partyAId = partyAId;
+        }
+        this.isSelect = true;
+        this.isAdd = false;
         this.open = true;
-        this.title = "修改cmc领导分管";
+        this.title = "修改领导分管";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.userId != null) {
+          if (!this.isAdd) {
+            this.form.deptId = this.formatArrayToString(this.form.deptId, ',') == '' ? undefined : this.formatArrayToString(this.form.deptId, ',');
+            this.form.partyAId = this.formatArrayToString(this.form.partyAId, ',') == '' ? undefined : this.formatArrayToString(this.form.partyAId, ',');
             updateManageDept(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.isAdd = false;
+              this.isSelect = false;
               this.getList();
             });
           } else {
+            this.form.deptId = this.formatArrayToString(this.form.deptId, ',') == '' ? undefined : this.formatArrayToString(this.form.deptId, ',');
+            this.form.partyAId = this.formatArrayToString(this.form.partyAId, ',') == '' ? undefined : this.formatArrayToString(this.form.partyAId, ',');
             addManageDept(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.isAdd = false;
+              this.isSelect = false;
               this.getList();
             });
           }
         }
       });
     },
+    formatArrayToString(str, splitStr) {
+      let newStr = "";
+      if (str) {
+        newStr = str.join(splitStr)
+      }
+      return newStr
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除cmc领导分管编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc分管领导为"' + this.getUserName(userIds) + '"的数据项？').then(function () {
         return delManageDept(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/staff/index.vue

@@ -652,8 +652,8 @@ export default {
               this.getList();
             });
           } else {
-            this.form.certificates = this.form.certificates.length == 0 ? '' : this.form.certificates;
-            this.form.politicalAffiliation = this.form.politicalAffiliation.length == 0 ? '' : this.form.politicalAffiliation;
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? undefined : this.formatArrayToString(this.form.politicalAffiliation, ',');
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;