haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审核

This commit is contained in:
cwchen 2024-07-25 14:09:15 +08:00
parent 6f0312a5d8
commit 1c3ef85396
5 changed files with 85 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java
View File

@ -34,9 +34,6 @@ public class OriginalRecordServiceImpl implements OriginalRecordService {
List<ExperimentalVo> list = new ArrayList<>(); List<ExperimentalVo> list = new ArrayList<>();
try { try {
list = mapper.getList(dto); list = mapper.getList(dto);
for (ExperimentalVo vo : list) {
}
} catch (Exception e) { } catch (Exception e) {
log.error(e.toString(), e); log.error(e.toString(), e);
} }

73
src/main/resources/mappers/basis/ExamineMapper.xml
View File

@ -105,44 +105,47 @@
<if test="roleCode=='administrators'"> <if test="roleCode=='administrators'">
AND process_status IN (1,2,3) AND audti_status = 0 AND process_status IN (1,2,3) AND audti_status = 0
</if> </if>
ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') ASC,ts.sample_date DESC ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') DESC,ts.sample_date DESC
</select> </select>
<!--审查详情列表--> <!--审查详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo"> <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
SELECT ANY_VALUE(tsd.sample_id) AS sampleId, SELECT * FROM (
ANY_VALUE(tsd.dev_type_name) AS devTypeName, SELECT ANY_VALUE(tsd.sample_id) AS sampleId,
tsd.dev_type_code AS devTypeCode, ANY_VALUE(tsd.dev_type_name) AS devTypeName,
ANY_VALUE(te.id) AS experId, tsd.dev_type_code AS devTypeCode,
COUNT(tsd.dev_type_code) AS sampleNum, ANY_VALUE(te.id) AS experId,
ANY_VALUE(te.audit_remakr) AS causeOfRejection, COUNT(tsd.dev_type_code) AS sampleNum,
ANY_VALUE(su2.user_name) AS experimenter, ANY_VALUE(te.audit_remakr) AS causeOfRejection,
ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime, ANY_VALUE(su2.user_name) AS experimenter,
CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交' ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime,
WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅' CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交'
WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过' WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅'
WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核' WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过'
WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过' WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核'
WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 0 THEN '待审批' WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过'
WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 4 THEN '审批不通过' WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 0 THEN '待审批'
WHEN ANY_VALUE(te.status) = 4 AND ANY_VALUE(te.audit_status) = 1 THEN '试验完成' WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 4 THEN '审批不通过'
ELSE '待试验' WHEN ANY_VALUE(te.status) = 4 AND ANY_VALUE(te.audit_status) = 1 THEN '试验完成'
END AS status ELSE '待试验'
FROM tb_sample_device tsd END AS status
LEFT JOIN tb_exper te ON tsd.sample_id = te.sample_id AND tsd.dev_type_code = te.dev_type_code AND te.del_flag = 0 FROM tb_sample_device tsd
LEFT JOIN sys_user su2 ON te.update_user = su2.id AND su2.del_flag = 0 LEFT JOIN tb_exper te ON tsd.sample_id = te.sample_id AND tsd.dev_type_code = te.dev_type_code AND te.del_flag = 0
WHERE tsd.sample_id = #{id} AND tsd.del_falg = 0 LEFT JOIN sys_user su2 ON te.update_user = su2.id AND su2.del_flag = 0
<if test="devTypeCode != null and devTypeCode!=''"> WHERE tsd.sample_id = #{id} AND tsd.del_falg = 0
AND INSTR(tsd.dev_type_code,#{devTypeCode}) <if test="devTypeCode != null and devTypeCode!=''">
</if> AND INSTR(tsd.dev_type_code,#{devTypeCode})
<if test="startTime != null and endTime!=''"> </if>
AND DATE_FORMAT(te.update_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} <if test="startTime != null and endTime!=''">
</if> AND DATE_FORMAT(te.update_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
<if test="keyWord != null and keyWord!=''"> </if>
AND ( <if test="keyWord != null and keyWord!=''">
INSTR(su2.user_name,#{keyWord}) > 0 AND (
) INSTR(su2.user_name,#{keyWord}) > 0
</if> )
GROUP BY tsd.dev_type_code </if>
GROUP BY tsd.dev_type_code
) a
ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
</select> </select>
<!--查询试验设备数量--> <!--查询试验设备数量-->
<select id="getExperDevItemsNum" resultType="java.util.Map"> <select id="getExperDevItemsNum" resultType="java.util.Map">

54
src/main/resources/mappers/basis/ExperimentalMapper.xml
View File

@ -323,33 +323,39 @@
<if test="roleCode == 'experimentalTeamMember' and teamId == null"> <if test="roleCode == 'experimentalTeamMember' and teamId == null">
AND ts.team_id = -1 AND ts.team_id = -1
</if> </if>
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成') ASC,ts.sample_date DESC ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成'),ts.sample_date DESC
</select> </select>
<!--试验详情列表--> <!--试验详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo"> <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
SELECT ANY_VALUE(tsd.sample_id) AS sampleId, SELECT * FROM (
ANY_VALUE(tsd.dev_type_name) AS devTypeName, SELECT ANY_VALUE(tsd.sample_id) AS sampleId,
tsd.dev_type_code AS devTypeCode, ANY_VALUE(tsd.dev_type_name) AS devTypeName,
ANY_VALUE(te.id) AS experId, tsd.dev_type_code AS devTypeCode,
COUNT(tsd.dev_type_code) AS sampleNum, ANY_VALUE(te.id) AS experId,
ANY_VALUE(te.audit_remakr) AS causeOfRejection, COUNT(tsd.dev_type_code) AS sampleNum,
CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交' ANY_VALUE(te.audit_remakr) AS causeOfRejection,
WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅' ANY_VALUE(su2.user_name) AS experimenter,
WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过' ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime,
WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核' CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交'
WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过' WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅'
WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 0 THEN '待审批' WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过'
WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 4 THEN '审批不通过' WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核'
WHEN ANY_VALUE(te.status) = 4 AND ANY_VALUE(te.audit_status) = 1 THEN '试验完成' WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过'
ELSE '待试验' WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 0 THEN '待审批'
END AS status WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 4 THEN '审批不通过'
FROM tb_sample_device tsd WHEN ANY_VALUE(te.status) = 4 AND ANY_VALUE(te.audit_status) = 1 THEN '试验完成'
LEFT JOIN tb_exper te ON tsd.sample_id = te.sample_id AND tsd.dev_type_code = te.dev_type_code AND te.del_flag = 0 ELSE '待试验'
WHERE tsd.sample_id = #{id} AND tsd.del_falg = 0 END AS status
<if test="devTypeCode != null and devTypeCode!=''"> FROM tb_sample_device tsd
AND INSTR(tsd.dev_type_code,#{devTypeCode}) LEFT JOIN tb_exper te ON tsd.sample_id = te.sample_id AND tsd.dev_type_code = te.dev_type_code AND te.del_flag = 0
</if> LEFT JOIN sys_user su2 ON te.update_user = su2.id AND su2.del_flag = 0
GROUP BY tsd.dev_type_code WHERE tsd.sample_id = #{id} AND tsd.del_falg = 0
<if test="devTypeCode != null and devTypeCode!=''">
AND INSTR(tsd.dev_type_code,#{devTypeCode})
</if>
GROUP BY tsd.dev_type_code
)a
ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待审核','待审批','试验完成') DESC,a.testTime DESC
</select> </select>
<!--查询试验模板数据、基础数据--> <!--查询试验模板数据、基础数据-->
<select id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo"> <select id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo">

49
src/main/resources/mappers/basis/OriginalRecordMapper.xml
View File

@ -15,34 +15,14 @@
DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate, DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
tt.team_name AS teamName, tt.team_name AS teamName,
ts.process_status AS status, ts.process_status AS status,
<if test="roleCode == 'experimentalTeamMember'"> CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅' WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核' WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批' WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成' WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
END AS audtiStatus, WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
</if> WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
<if test="roleCode == 'experimentalTeamLeader' or roleCode = 'administrators'"> END AS audtiStatus,
CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
END AS audtiStatus,
</if>
<if test="roleCode == 'technicalDirector'">
CASE WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
END AS audtiStatus,
</if>
<if test="roleCode=='centerManager'">
CASE WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
END AS audtiStatus,
</if>
ts.remarks ts.remarks
FROM tb_sample ts FROM tb_sample ts
LEFT JOIN tb_custom tc ON ts.custom_id = tc.id LEFT JOIN tb_custom tc ON ts.custom_id = tc.id
@ -50,10 +30,10 @@
LEFT JOIN sys_user su2 ON ts.update_user = su2.id AND su2.del_flag = 0 LEFT JOIN sys_user su2 ON ts.update_user = su2.id AND su2.del_flag = 0
LEFT JOIN tb_team tt ON ts.team_id = tt.id AND tt.del_flag = 0 LEFT JOIN tb_team tt ON ts.team_id = tt.id AND tt.del_flag = 0
LEFT JOIN ( LEFT JOIN (
SELECT sample_id,COUNT(sample_id) AS num,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_name)) AS sampleDev,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_code)) AS sampleDevCode SELECT sample_id,COUNT(sample_id) AS num,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_name)) AS sampleDev,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_code)) AS sampleDevCode
FROM tb_sample_device FROM tb_sample_device
WHERE del_falg = 0 WHERE del_falg = 0
GROUP BY sample_id GROUP BY sample_id
) tsd ON tsd.sample_id = ts.id ) tsd ON tsd.sample_id = ts.id
WHERE ts.del_flag = 0 WHERE ts.del_flag = 0
<if test="keyWord != null and keyWord!=''"> <if test="keyWord != null and keyWord!=''">
@ -71,10 +51,11 @@
<if test="devTypeCode != null and devTypeCode!=''"> <if test="devTypeCode != null and devTypeCode!=''">
AND INSTR(tsd.sampleDevCode,#{devTypeCode}) AND INSTR(tsd.sampleDevCode,#{devTypeCode})
</if> </if>
/*试验班组成员-待审核/待审批/试验完成*/ /*试验班组成员-待审阅/待审核/待审批/试验完成*/
<if test="roleCode == 'experimentalTeamMember'"> <if test="roleCode == 'experimentalTeamMember'">
<if test="teamId != null"> <if test="teamId != null">
AND ts.team_id = #{teamId} AND ( AND ts.team_id = #{teamId} AND (
(ts.process_status = 1 AND audti_status = 0) OR
(ts.process_status = 2 AND audti_status = 0) OR (ts.process_status = 2 AND audti_status = 0) OR
(ts.process_status = 3 AND audti_status = 0) OR (ts.process_status = 3 AND audti_status = 0) OR
(ts.process_status = 4 AND audti_status = 1) (ts.process_status = 4 AND audti_status = 1)
@ -127,6 +108,6 @@
(ts.process_status = 4 AND audti_status = 1) (ts.process_status = 4 AND audti_status = 1)
) )
</if> </if>
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,ts.sample_date DESC ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') DESC,ts.sample_date DESC
</select> </select>
</mapper> </mapper>

4
src/main/resources/static/js/basis/originalRecord.js
View File

@ -185,9 +185,9 @@ function getValueByKey(obj, key) {
/**设置审核类型*/ /**设置审核类型*/
function setButtonName(id, value, status) { function setButtonName(id, value, status) {
let cent = ""; let cent = "";
const btnName = getValueByKey(data, value + status) const btnName = '审查记录';
if (btnName) { if (btnName) {
cent += "<a title='" + btnName + "' onclick=\"auditData('" + id + "','" + status + "','" + btnName + "')\">" + btnName + "</a>"; cent += "<a title='" + btnName + "' onclick=\"auditData('" + id + "','" + status + "','" + btnName + "')\">"+btnName+"</a>";
} }
return cent; return cent;
} }