mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 检验任务新增 作业规则查询

Browse Source
This commit is contained in:
luochen 2024-11-27 13:02:51 +08:00
parent ef98917cd7
commit 2d64e17790
4 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java
View File

@ -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;
}

14
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -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();

10
qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
View File

@ -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);
}

25
qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
View File

@ -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>