QMS修改

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -1951,6 +1951,24 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 04-MHM 责任人可选职位（role 7、8）
+     */
+    @PostMapping("/getMhmResponsibleRoleList")
+    public R getMhmResponsibleRoleList(){
+        List<EamAdminData> list = qcService.getMhmResponsibleRoleList();
+        return R.ok().put("rows", list);
+    }
+
+    /**
+     * 04-MHM 按职位名称查询 role
+     */
+    @PostMapping("/getMhmRoleByName")
+    public R getMhmRoleByName(@RequestBody EamAdminData data){
+        List<EamAdminData> list = qcService.getMhmRoleByName(data);
+        return R.ok().put("rows", list);
+    }
+
     /**
      * 获取采集数据内容
      * @return

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -525,6 +525,14 @@ public interface QcMapper {
 
     List<EamAdminData> getResponsibleOperatorList(EamAdminData data);
 
+    List<EamAdminData> getMhmResponsibleOperatorList(EamAdminData data);
+
+    List<EamAdminData> getMhmResponsibleRoleList();
+
+    List<EamAdminData> getMhmOperatorListByRoleName(EamAdminData data);
+
+    List<EamAdminData> getMhmRoleByName(EamAdminData data);
+
     List<QcCollectionDataContentData> getDataContentList(QcCollectionDataContentData data);
 
     String getItemCollectionDataContent(SubDetailValues data);

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -4630,10 +4630,32 @@ public class QcServiceImpl implements QcService {
         } else {
             throw new RuntimeException("工厂和部门有误!");
         }
+        if ("04-MHM".equals(data.getBuNo())) {
+            List<EamAdminData> list;
+            if (StringUtils.isNotBlank(data.getRoleName())) {
+                list = qcMapper.getMhmOperatorListByRoleName(data);
+            } else {
+                list = qcMapper.getMhmResponsibleOperatorList(data);
+            }
+            return list.stream()
+                    .collect(Collectors.collectingAndThen(
+                            Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(EamAdminData::getAdminID))),
+                            ArrayList::new));
+        }
         List<EamAdminData> list = qcMapper.getResponsibleOperatorList(data);
         return list;
     }
 
+    @Override
+    public List<EamAdminData> getMhmResponsibleRoleList() {
+        return qcMapper.getMhmResponsibleRoleList();
+    }
+
+    @Override
+    public List<EamAdminData> getMhmRoleByName(EamAdminData data) {
+        return qcMapper.getMhmRoleByName(data);
+    }
+
     /**
      * 获取采集数据内容
      */

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -304,6 +304,10 @@ public interface QcService {
 
     List<EamAdminData> getResponsibleOperatorList(EamAdminData data);
 
+    List<EamAdminData> getMhmResponsibleRoleList();
+
+    List<EamAdminData> getMhmRoleByName(EamAdminData data);
+
     List<QcCollectionDataContentData> getDataContentList(QcCollectionDataContentData data);
 
     List<EamObjectInData> getObjectList1(EamObjectInData data);

src/main/resources/application-dev.yml

@@ -5,6 +5,7 @@ spring:
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #      url: jdbc:sqlserver://192.168.1.90:1433;databaseName=CKP_MES_Real_250207
       url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=CKT_MES_II_REAL
+      #url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=CKT_MES_TX_REAL
 #      url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ckp-srm
       username: sa
       password: XJsoft123

src/main/resources/mapper/pms/QcMapper.xml

@@ -4090,6 +4090,81 @@
         </where>
     </select>
 
+    <!-- 04-MHM 责任人：role(7,8) + user_role + users -->
+    <select id="getMhmResponsibleOperatorList" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT DISTINCT
+            u.id as userId,
+            u.username as adminID,
+            u.display as adminName,
+            u.department as departmentName,
+            ur.role_id as roleId,
+            r.name as roleName
+        FROM users u
+        INNER JOIN user_role ur ON u.id = ur.user_id
+        INNER JOIN role r ON ur.role_id = r.id
+        <where>
+            ur.role_id IN (7, 8)
+            AND (u.active = 'Y' OR u.active IS NULL)
+            <if test="site != null and site != ''">
+                AND u.site = #{site}
+            </if>
+            <if test="adminID != null and adminID != ''">
+                AND u.username LIKE '%' + #{adminID} + '%'
+            </if>
+            <if test="adminName != null and adminName != ''">
+                AND u.display LIKE '%' + #{adminName} + '%'
+            </if>
+            <if test="roleId != null and roleId != ''">
+                AND ur.role_id = #{roleId}
+            </if>
+        </where>
+        ORDER BY u.username
+    </select>
+
+    <select id="getMhmResponsibleRoleList" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT id as roleId, name as roleName
+        FROM role
+        WHERE id IN (7, 8)
+        ORDER BY id
+    </select>
+
+    <!-- 04-MHM 协同人员：按职位名称 -->
+    <select id="getMhmOperatorListByRoleName" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT DISTINCT
+            u.id as userId,
+            u.username as adminID,
+            u.display as adminName,
+            u.department as departmentName,
+            ur.role_id as roleId,
+            r.name as roleName
+        FROM users u
+        INNER JOIN user_role ur ON u.id = ur.user_id
+        INNER JOIN role r ON ur.role_id = r.id
+        <where>
+            r.name = #{roleName}
+            AND (u.active = 'Y' OR u.active IS NULL)
+            <if test="site != null and site != ''">
+                AND u.site = #{site}
+            </if>
+            <if test="adminID != null and adminID != ''">
+                AND u.username LIKE '%' + #{adminID} + '%'
+            </if>
+            <if test="adminName != null and adminName != ''">
+                AND u.display LIKE '%' + #{adminName} + '%'
+            </if>
+            <if test="roleId != null and roleId != ''">
+                AND ur.role_id = #{roleId}
+            </if>
+        </where>
+        ORDER BY u.username
+    </select>
+
+    <select id="getMhmRoleByName" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT id as roleId, name as roleName
+        FROM role
+        WHERE name = #{roleName}
+    </select>
+
     <select id="getDataContentList" parameterType="com.xujie.sys.modules.pms.data.QcCollectionDataContentData" resultType="com.xujie.sys.modules.pms.data.QcCollectionDataContentData">
         select
             content_desc