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<>();
try {
list = mapper.getList(dto);
for (ExperimentalVo vo : list) {
}
} catch (Exception e) {
log.error(e.toString(), e);
}

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

@ -105,10 +105,11 @@
<if test="roleCode=='administrators'">
AND process_status IN (1,2,3) AND audti_status = 0
</if>
ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') ASC,ts.sample_date DESC
ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') DESC,ts.sample_date DESC
</select>
<!--审查详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
SELECT * FROM (
SELECT ANY_VALUE(tsd.sample_id) AS sampleId,
ANY_VALUE(tsd.dev_type_name) AS devTypeName,
tsd.dev_type_code AS devTypeCode,
@ -143,6 +144,8 @@
)
</if>
GROUP BY tsd.dev_type_code
) a
ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
</select>
<!--查询试验设备数量-->
<select id="getExperDevItemsNum" resultType="java.util.Map">

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

@ -323,16 +323,19 @@
<if test="roleCode == 'experimentalTeamMember' and teamId == null">
AND ts.team_id = -1
</if>
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成') ASC,ts.sample_date DESC
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成'),ts.sample_date DESC
</select>
<!--试验详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
SELECT * FROM (
SELECT ANY_VALUE(tsd.sample_id) AS sampleId,
ANY_VALUE(tsd.dev_type_name) AS devTypeName,
tsd.dev_type_code AS devTypeCode,
ANY_VALUE(te.id) AS experId,
COUNT(tsd.dev_type_code) AS sampleNum,
ANY_VALUE(te.audit_remakr) AS causeOfRejection,
ANY_VALUE(su2.user_name) AS experimenter,
ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime,
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) = 0 THEN '待审阅'
WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过'
@ -345,11 +348,14 @@
END AS status
FROM tb_sample_device tsd
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
LEFT JOIN sys_user su2 ON te.update_user = su2.id AND su2.del_flag = 0
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 id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo">

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

@ -15,34 +15,14 @@
DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
tt.team_name AS teamName,
ts.process_status AS status,
<if test="roleCode == 'experimentalTeamMember'">
CASE WHEN ts.process_status = 1 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 = 4 AND ts.audti_status = 1 THEN '试验完成'
END AS audtiStatus,
</if>
<if test="roleCode == 'experimentalTeamLeader' or roleCode = 'administrators'">
CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 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 = 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
FROM tb_sample ts
LEFT JOIN tb_custom tc ON ts.custom_id = tc.id
@ -71,10 +51,11 @@
<if test="devTypeCode != null and devTypeCode!=''">
AND INSTR(tsd.sampleDevCode,#{devTypeCode})
</if>
/*试验班组成员-待审核/待审批/试验完成*/
/*试验班组成员-待审阅/待审核/待审批/试验完成*/
<if test="roleCode == 'experimentalTeamMember'">
<if test="teamId != null">
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 = 3 AND audti_status = 0) OR
(ts.process_status = 4 AND audti_status = 1)
@ -127,6 +108,6 @@
(ts.process_status = 4 AND audti_status = 1)
)
</if>
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,ts.sample_date DESC
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') DESC,ts.sample_date DESC
</select>
</mapper>

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

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