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-24 15:41:57 +08:00
parent 04a7e58646
commit 96b0d23ab5
5 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
* @author:cwchen * @author:cwchen
* @date:2024-07-24-14:11 * @date:2024-07-24-14:11
* @version:1.0 * @version:1.0
* @description:原始记录管理-controller * @description:审查记录管理-controller
*/ */
@RestController @RestController
@RequestMapping("/originalRecord/") @RequestMapping("/originalRecord/")

6
src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java
View File

@ -11,12 +11,12 @@ import java.util.List;
* @author:cwchen * @author:cwchen
* @date:2024-07-24-14:12 * @date:2024-07-24-14:12
* @version:1.0 * @version:1.0
* @description:原始记录-service * @description:审查记录-service
*/ */
public interface OriginalRecordService { public interface OriginalRecordService {
/** /**
* 原始记录列表 * 审查记录列表
* *
* @param data * @param data
* @return List<ExperimentalVo> * @return List<ExperimentalVo>
@ -26,7 +26,7 @@ public interface OriginalRecordService {
List<ExperimentalVo> getList(ParamsDto data); List<ExperimentalVo> getList(ParamsDto data);
/** /**
* 原始记录审查详情列表 * 审查详情列表
* @param data * @param data
* @return List<ExperimentalDetailVo> * @return List<ExperimentalDetailVo>
* @author cwchen * @author cwchen

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

@ -20,7 +20,7 @@ import java.util.Map;
* @author:cwchen * @author:cwchen
* @date:2024-07-24-14:12 * @date:2024-07-24-14:12
* @version:1.0 * @version:1.0
* @description:原始记录-impl * @description:审查记录-impl
*/ */
@Service(value = "OriginalRecordService") @Service(value = "OriginalRecordService")
@Slf4j @Slf4j

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

@ -15,16 +15,16 @@
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 == 'experimentalTeam'"> <if test="roleCode == 'experimentalTeamLeader'">
WHEN process_status = 1 AND audti_status = 0 THEN '待审阅' CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
<if test="roleCode == 'technicalDirector'"> <if test="roleCode == 'technicalDirector'">
WHEN process_status = 2 AND audti_status = 0 THEN '待审核' CASE WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
<if test="roleCode=='centerManager'"> <if test="roleCode=='centerManager'">
WHEN process_status = 3 AND audti_status = 0 THEN '待审批' CASE WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
<if test="roleCode == 'administrators'"> <if test="roleCode == 'administrators'">

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

@ -15,22 +15,28 @@
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 == 'experimentalTeam'"> <if test="roleCode == 'experimentalTeamMember' or roleCode = 'administrators'">
WHEN process_status = 1 AND audti_status = 0 THEN '待审阅' 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 == 'experimentalTeamLeader'">
CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
WHEN process_status > 1 THEN '待审核'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
<if test="roleCode == 'technicalDirector'"> <if test="roleCode == 'technicalDirector'">
WHEN process_status = 2 AND audti_status = 0 THEN '待审核' CASE WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
WHEN process_status > 2 THEN '待审批'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
<if test="roleCode=='centerManager'"> <if test="roleCode=='centerManager'">
WHEN process_status = 3 AND audti_status = 0 THEN '待审批' CASE WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
END AS audtiStatus, WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
</if>
<if test="roleCode == 'administrators'">
CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
END AS audtiStatus, END AS audtiStatus,
</if> </if>
ts.remarks ts.remarks
@ -61,37 +67,52 @@
<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 != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode == 'experimentalTeamLeader'"> <if test="roleCode == 'experimentalTeamMember'">
/*试验班组-班组长审阅-只审阅本班组提交的审阅*/
<if test="teamId != null"> <if test="teamId != null">
AND ts.team_id = #{teamId} AND ts.team_id = #{teamId} AND (
(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)
)
</if> </if>
<if test="teamId ==null"> <if test="teamId ==null">
AND ts.team_id = -1 AND ts.team_id = -1
</if> </if>
</if> </if>
/*非管理员、非技术负责人、非中心负责人、非试验班组长无审查数据权限*/ /*试验班组长-审阅不通过/待审核/审核不通过/待审批/审批不通过/试验完成*/
<if test="roleCode != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode != 'experimentalTeamLeader'"> <if test="roleCode == 'experimentalTeamLeader'">
<if test="teamId != null">
AND ts.team_id = #{teamId} AND (
(ts.process_status = 1 AND audti_status = 2) OR
(ts.process_status = 2 AND audti_status = 0) OR
(ts.process_status = 2 AND audti_status = 2) OR
(ts.process_status = 3 AND audti_status = 0) OR
(ts.process_status = 3 AND audti_status = 2) OR
(ts.process_status = 4 AND audti_status = 1)
)
</if>
<if test="teamId ==null">
AND ts.team_id = -1 AND ts.team_id = -1
</if> </if>
/*班组长-审阅*/
<if test="roleCode == 'experimentalTeam'">
AND process_status = 1 AND audti_status = 0
</if> </if>
/*技术负责人-审核*/ /*技术负责人-审核不通过/待审批/审批不通过/试验完成*/
<if test="roleCode == 'technicalDirector'"> <if test="roleCode == 'technicalDirector'">
AND process_status = 2 AND audti_status = 0 AND (
(ts.process_status = 2 AND audti_status = 2) OR
(ts.process_status = 3 AND audti_status = 0) OR
(ts.process_status = 3 AND audti_status = 2) OR
(ts.process_status = 4 AND audti_status = 1)
)
</if> </if>
/*中心负责人-审批*/ /*中心负责人-审批不通过/试验完成*/
<if test="roleCode=='centerManager'"> <if test="roleCode == 'centerManager'">
AND process_status = 3 AND audti_status = 0 AND (
(ts.process_status = 3 AND audti_status = 2) OR
(ts.process_status = 4 AND audti_status = 1)
)
</if> </if>
/*管理员*/ ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC
<if test="roleCode=='administrators'">
AND process_status IN (1,2,3) AND audti_status = 0
</if>
ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') ASC,dispatch_time ASC
</select> </select>
<!--原始记录审查详情列表--> <!--原始记录审查详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo"> <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">