From 2d64e177906db210c527d9fcb7db3688c290b659 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 27 Nov 2024 13:02:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E4=BD=9C=E4=B8=9A=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iep/qms/dto/QmsInspecJobDTO.java          |  5 ++++
 .../service/impl/QmsInspecJobServiceImpl.java | 14 ++++++++++-
 .../iep/qms/mapper/QmsInspecJobMapper.java    | 10 ++++++++
 .../qms/mapper/QmsInspecJobMapper.xml         | 25 +++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java b/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java
index 18eab09..92a04f2 100644
--- a/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java
@@ -76,4 +76,9 @@ public class QmsInspecJobDTO extends QmsInspecJob {
     
     private String calibrationType;
     private List<QmsInspecDetailDTO> inspecDetailList;
+
+    private String userName;
+    private String roleCode;
+    private List<String> activityIdQcSubList;
+    private List<String> activityIdUserGroupList;
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
index 35dcb8a..70d60da 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
@@ -148,7 +148,19 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
     
     @Override
     public IPage<QmsInspecJobDTO> selectAll(FrontPage page, QmsInspecJobDTO dto) {
-        dto.setSite(TenantContextHolder.getTenantId());
+        String site = TenantContextHolder.getTenantId();
+        dto.setSite(site);
+        dto.setUserName(SecurityUtils.getUserName());
+        //查询当前用户，角色
+        List<Map<String, String>> checkedJobRule = baseMapper.checkJobRule(SecurityUtils.getUserName(), site, dto.getActivityIdUserGroupList());
+        if (checkedJobRule.isEmpty()) {
+            return page;
+        }
+        //查询检验细类
+        List<Map<String, String>> checkJobQcSub = baseMapper.checkJobQcSub(site, dto.getActivityIdQcSubList());
+        if (checkJobQcSub.isEmpty()) {
+            return page;
+        }
         if (dto.isPersonal()) {
             List<SysRoleDTO> roles = remoteRoleService.findRolesByUser(
                     Collections.singletonList(SecurityUtils.getUserName()), SecurityConstants.FROM_IN).getData();
diff --git a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
index 147c5da..847cea3 100644
--- a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
+++ b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
@@ -11,6 +11,10 @@ import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 产品检验任务作业-主文件
  *
@@ -35,4 +39,10 @@ public interface QmsInspecJobMapper extends MomBaseMapper<QmsInspecJob> {
     IPage<QmsInspecJobDTO> selectInstrument(FrontPage page, @Param("dto") QmsInspecJobDTO dto);
 
     IPage<QmsInspecJobDTO> selectIQCExt(FrontPage page, @Param("dto") QmsInspecJobDTO dto);
+
+    List<Map<String,String>> checkJobRule(@Param("userName")String userName,
+                                    @Param("site")String site,
+                                    @Param("activityIdUserGroupList")List<String> activityIdUserGroupList);
+
+    List<Map<String,String>> checkJobQcSub(@Param("site")String site,@Param("activityIdQcSubList")List<String> activityIdQcSubList);
 }
diff --git a/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml b/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
index c7ad40f..4b34924 100644
--- a/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
+++ b/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
@@ -61,6 +61,8 @@
         <result property="groupName" column="GROUP_NAME"/>
         <result property="groupNo" column="GROUP_NO"/>
         <result property="calibrationType" column="CALIBRATION_TYPE"/>
+        <result property="userName" column="USER_NAME"/>
+        <result property="roleCode" column="ROLE_CODE"/>
     </resultMap>
     <resultMap id="item" type="com.foreverwin.iep.qms.domain.Item">
         <result property="item" column="ITEM"/>
@@ -429,4 +431,27 @@
         </where>
         order by qij.JOB_NO
     </select>
+    <select id="checkJobRule" resultType="java.util.HashMap">
+        select ur.USERNAME ,sr.ROLE_CODE
+        from momx.SYS_USER ur
+         join momx.SYS_USER_ROLE se on se.USER_ID = ur.USER_ID
+         join momx.SYS_ROLE sr on sr.ROLE_ID = se.ROLE_ID
+        where ur.USERNAME = #{userName}
+        and sr.TENANT_ID = #{site}
+        and sr.ROLE_CODE in
+        <foreach collection="activityIdUserGroupList" item="roleCode" open="(" separator="," close=")">
+            #{roleCode}
+        </foreach>
+    </select>
+
+    <select id="checkJobQcSub" resultType="java.util.HashMap">
+        SELECT sm.ITEM_VALUE
+        from momx.SYS_DICT st
+         join momx.SYS_DICT_ITEM sm on sm.DICT_TYPE = st.DICT_TYPE
+        where st.TENANT_ID = #{site} and sm.TENANT_ID = #{site} and st.DICT_TYPE = 'qc_sub_categories'
+          and sm.ITEM_VALUE in 
+        <foreach collection="activityIdQcSubList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>