FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4-12 审查流程入库页面展示

Browse Source
This commit is contained in:
yuezhihang
2022-04-12 17:40:20 +08:00
parent 362f82c639
commit f96714b0d2
10 changed files with 266 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml
+21 -4
View File
@@ -23,22 +23,32 @@
<select id="findPage" resultMap="BusinessIssuePage">
select t.* from (
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
UNION ALL
SELECT
issue.*,
laws.STAND_CODE AS lawNumber,
laws.STAND_NAME AS lawName
laws.STAND_NAME AS lawName,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_bussioness_stand AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
UNION ALL
@@ -50,15 +60,22 @@
'-',
laws.STAND_YEAR
) AS lawNumber,
laws.STAND_NAME AS lawName
laws.STAND_NAME AS lawName,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_standards_info AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
) t
where t.LAWS_NAME is not null and t.LAWS_NUMBER is not null
<if test="null != dept and dept != ''">
and t.responseInsName like concat('%',#{dept},'%')
</if>
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml
+65 -5
View File
@@ -21,12 +21,72 @@
<select id="findPage" resultMap="ProductIssuePage">
select a.* from (
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
issue.*,
laws.LAWS_NUMBER,
laws.LAWS_NAME ,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE 1=1
AND laws.LAWS_NAME is NOT NULL AND laws.LAWS_NUMBER is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
UNION all
SELECT
issue.*,
CONCAT(laws.
STAND_SORT,' ',laws.STAND_NUMBER,'-',laws.STAND_YEAR)as LAWS_NUMBER,
laws.STAND_NAME as LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_standards_info AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE
1=1
AND laws.STAND_SORT is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">
and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
UNION all
SELECT
issue.*,
laws.STAND_CODE as LAWS_NUMBER,
laws.STAND_NAME as LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_bussioness_stand AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE
1=1
AND laws.STAND_CODE is NOT NULL AND laws.STAND_NAME is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">
and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
)a
where 1=1
<if test="null != ew.lawsNumber and ew.lawsNumber != ''">
and ( a.LAWS_NUMBER like concat('%',#{ew.lawsNumber},'%') or a.LAWS_NAME like concat('%',#{ew.lawsNumber},'%') )
</if>
<if test="null != ew.responseInsName and ew.responseInsName != ''">
and a.responseInsName like concat('%',#{ew.responseInsName},'%')
</if>
</select>
</mapper>