liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
马三炮 2025-07-17 11:02:36 +08:00
parent 7d025fa7d3
commit 02707d6a6b
7 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/ConfigurationVo.java
View File

@ -16,6 +16,9 @@ public class ConfigurationVo {
private String nodeName;
private String checkPerson;
private String examineType;
/**
* 0不支持 1支持
*/
private String finalJudgment;
private String createTime;
private String updateTime;
@ -40,5 +43,4 @@ public class ConfigurationVo {
private String isAudit;
}

2
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java
View File

@ -586,4 +586,6 @@ public interface BusinessMapper {
* @return
*/
int updateSupPersonOutStatusByUuid(@Param("uuid")String uuid, @Param("statusType")String statusType);
ConfigurationVo getAuditStatus(ConfigurationVo bean);
}

11
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
View File

@ -856,6 +856,7 @@ public class BusinessServiceImpl implements BusinessService {
@Override
public List<ConfigurationVo> approvalHistoryUser(String taskId) {
//获取审核列表
List<ConfigurationVo> list = mapper.approvalHistoryUser(taskId);
List<ConfigurationVo> finalList = new ArrayList<>();
ConfigurationVo bbb = new ConfigurationVo();
@ -866,9 +867,17 @@ public class BusinessServiceImpl implements BusinessService {
String[] stringArray = userName.toArray(new String[0]);
if ("0".equals(examineType)) {
for (int i = 0; i < stringArray.length; i++) {
//获取已审核信息
ConfigurationVo req = new ConfigurationVo();
req.setUserId(ss.get(i));
req.setTaskId(bean.getTaskId());
req.setVersion(bean.getVersion());
req = mapper.getAuditStatus(req);
ConfigurationVo newBean = new ConfigurationVo();
newBean.setId(bean.getId());
newBean.setAuditStatus(bean.getAuditStatus());
if (StringUtils.isNotNull(req)){
newBean.setAuditStatus(req.getAuditStatus());
}
newBean.setExamineId(bean.getExamineId());
newBean.setTaskId(bean.getTaskId());
newBean.setNodeName(bean.getNodeName());

11
bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
View File

@ -740,10 +740,12 @@
<select id="approvalHistoryUser" resultType="com.bonus.flowable.entity.ConfigurationVo">
select distinct a.id ,a.task_id as taskId,a.user_id as userId,a.exam_type as examineType,
b.audit_status as auditStatus
b.audit_status as auditStatus,a.version as version,pccd.final_judgment as finalJudgment
from nxdt_ii.pt_check_person a
left join nxdt_ii.pt_check_person_remark b on a.task_id = b.task_id and a.user_id = b.user_id and a.version = b.version
where a.type= '2' and a.task_id = #{taskId}
left join nxdt_ii.pt_check_task pct on a.task_id = pct.task_id
left join nxdt_ii.pt_check_configuration_details pccd on pct.examine_id = pccd.examine_id and pccd.check_person = a.user_id
where a.type= '2' and a.task_id = #{taskId} order by a.sort
</select>
@ -956,5 +958,10 @@
limit 1
</select>
<select id="getAuditStatus" resultType="com.bonus.flowable.entity.ConfigurationVo">
select audit_status as auditStatus
from nxdt_ii.pt_check_person_remark
where version = #{version} and user_id = #{userId} and task_id = #{taskId} and type = '1'
</select>
</mapper>

4
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml
View File

@ -546,7 +546,7 @@
ypi.rejection_delay AS rejectionDelay,
ypd.delay_reason AS delayReason,
ypd.user_id As userId
FROM yh_pitfall_info ypi
FROM yh_pitfall_info ypi
LEFT JOIN yh_pitfall_detaills ypd ON ypi.pitfall_id = ypd.pitfall_id
LEFT JOIN sys_dict_data sdd
ON ypi.check_status = sdd.dict_value AND sdd.dict_type = 'yn_check_status' AND sdd.status = 0
@ -573,7 +573,7 @@
<if test="pitfallLevelId != null and pitfallLevelId != ''">
AND ypd.pitfall_type_id = #{pitfallLevelId}
</if>
<if test="status != null and status != ''">
<if test="status != null and status != '' and checkState!=1 and checkState!='1'">
AND ypi.delay_check_state = #{status}
</if>
<if test="hazardQuestionCode != null and hazardQuestionCode != ''">

2
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml
View File

@ -374,7 +374,7 @@
<if test="signerName != null and signerName != ''">
and wvd.issuer_name like concat('%',#{signerName},'%')
</if>
<if test="status != null and status != '' and status != 1 and status != '1' ">
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2">
and wvi.check_status = #{status}
</if>
order by wvi.violation_id desc

4
bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
View File

@ -257,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lkc.departure_date AS departureDate,
lkc.into_status as intoStatus,
#{dataType} as status,
lkc.task_id AS taskId,
lpc.task_id AS taskId,
lkc.proc_inst_id AS procInsId,
pcp.cons_user_id AS consUserId,
pcp.cons_name AS consName,
@ -279,6 +279,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lk_cont_person lkc
LEFT JOIN
pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
LEFT JOIN
lk_pro_cont lpc ON lkc.pro_id = lpc.pro_id
LEFT JOIN sys_dict_data sdd ON pcp.post = sdd.dict_value AND sdd.dict_type = 'sys_cons_post'
<where>
pcp.is_active = '1'