WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目管理-未符合项列表查询修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-05-08 16:08:12 +08:00
parent bd79e08769
commit 5b6780ab3d
2 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+76 -8
View File
@@ -26,6 +26,7 @@
<select id="getInfoList" resultMap="NcrTrackVOResultMap">
<!--
SELECT
pni.project_name,plb.target_market,plb.project_version,pyni.year_name,
pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,pli.stand_id,
@@ -38,7 +39,41 @@
left join project_name_info pni on pni.id = plb.project_name_id
left join project_task_inventory_detail ptid on ptid.project_task_inventory_id = pti.project_laws_inventory_id
left join project_year_name_info pyni on pyni.id = plb.year_name_id
-->
SELECT
pni.project_name,
plb.target_market,
plb.project_version,
pyni.year_name,
pli.serial_number,
pli.title,
pli.duty_territory,
pli.create_time,
pli.project_library_id,
pli.stand_id,
pli.regulation_owner_id as design_initiator_id,
pli.design_duty_id,
pli.regulation_owner_id as verify_initiator_id,
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
pli.id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '2' order by pi.create_time desc limit 0,1
) as design_p_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '4' order by pi.create_time desc limit 0,1
) as verify_p_id
FROM project_laws_inventory pli
LEFT JOIN project_library_base plb ON plb.id = pli.project_library_id
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where
<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
@@ -77,9 +112,8 @@
and
</if>
(
design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track}
or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track}
or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track}
design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
)
<!--如果当前操作人不是系统管理员角色，查询跟自己相关的数据，如果是系统管理员，查询所有的-->
<if test="ncrTrackVO.administrator == 'false'">
@@ -96,6 +130,7 @@
</select>
<select id="getViewerInfoList" resultMap="NcrTrackVOResultMap">
<!--
SELECT
pni.project_name,plb.target_market,
pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,
@@ -107,7 +142,41 @@
left join project_library_base plb on plb.id = pli.project_library_id
left join project_name_info pni on pni.id = plb.project_name_id
left join project_task_inventory_detail ptid on ptid.project_task_inventory_id = pti.project_laws_inventory_id
-->
SELECT
pni.project_name,
plb.target_market,
plb.project_version,
pyni.year_name,
pli.serial_number,
pli.title,
pli.duty_territory,
pli.create_time,
pli.project_library_id,
pli.stand_id,
pli.regulation_owner_id as design_initiator_id,
pli.design_duty_id,
pli.regulation_owner_id as verify_initiator_id,
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
pli.id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '2' order by pi.create_time desc limit 0,1
) as design_p_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '4' order by pi.create_time desc limit 0,1
) as verify_p_id
FROM project_laws_inventory pli
LEFT JOIN project_library_base plb ON plb.id = pli.project_library_id
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where
<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
@@ -134,9 +203,8 @@
and
</if>
(
design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track}
or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track}
or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track}
design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
)
and pli.duty_territory in
<foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+13 -1
View File
@@ -121,12 +121,24 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
Set<String> userIdSet = new HashSet<>();
for (NcrTrackVO trackVO : infoList) {
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
/*if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
userIdSet.add(trackVO.getDesignInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
userIdSet.add(trackVO.getPrehomoInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
userIdSet.add(trackVO.getVerifyInitiatorId());
}*/
if(StringUtils.isNotBlank(trackVO.getDesignDutyId())){
userIdSet.add(trackVO.getDesignDutyId());
}
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
userIdSet.add(trackVO.getDesignInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyDutyId())){
userIdSet.add(trackVO.getVerifyDutyId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
userIdSet.add(trackVO.getVerifyInitiatorId());
}