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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-02-20 19:22:13 +08:00
parent 4f68c12418 3cdf018629
commit b9d8b980f4
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java
View File

@ -12,6 +12,7 @@ import com.bonus.flowable.service.BusinessService;
import com.bonus.flowable.utils.FlowTaskUtils; import com.bonus.flowable.utils.FlowTaskUtils;
import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.RemoteUserService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import liquibase.pro.packaged.A;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -57,6 +58,11 @@ public class BusinessController {
if (StringUtils.isNotBlank(auditTask.getTaskId())){ if (StringUtils.isNotBlank(auditTask.getTaskId())){
taskIdArr = auditTask.getTaskId().split(","); taskIdArr = auditTask.getTaskId().split(",");
} }
// if(uuidArr.length!=taskIdArr.length){
// return AjaxResult.error("数据异常,请联系管理员进行处理!");
// }
//TODO -异常bug -未发现是怎么回显 数组越界
AjaxResult code = null; AjaxResult code = null;
for (int i = 0; i < uuidArr.length; i++) { for (int i = 0; i < uuidArr.length; i++) {
auditTask.setUuid(uuidArr[i]); auditTask.setUuid(uuidArr[i]);

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

@ -407,7 +407,6 @@
replace into nxdt_ii.pt_check_person_remark( replace into nxdt_ii.pt_check_person_remark(
task_id, user_id,type,version,audit_status,remark,audit_time,audit_remark task_id, user_id,type,version,audit_status,remark,audit_time,audit_remark
)values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now(),#{reason}) )values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now(),#{reason})
</insert> </insert>
<select id="getCommentListByProcessInstanceId" resultType="com.bonus.flowable.entity.CheckComment"> <select id="getCommentListByProcessInstanceId" resultType="com.bonus.flowable.entity.CheckComment">

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

@ -374,12 +374,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lkc.pro_id AS proId, lkc.pro_id AS proId,
lkc.cont_uuid AS contUuid, lkc.cont_uuid AS contUuid,
lkc.cons_persion_id AS consPersonId, lkc.cons_persion_id AS consPersonId,
lkc.cont_uuid AS contUuid,
lkc.sub_uuid AS subUuid, lkc.sub_uuid AS subUuid,
lkc.admission_date AS admissionDate, lkc.admission_date AS admissionDate,
lkc.departure_date AS departureDate, lkc.departure_date AS departureDate,
lkc.out_status as intoStatus, lkc.out_status as intoStatus,
#{dataType} as status, #{bean.dataType} as status,
lkc.task_id_out AS taskId, lkc.task_id_out AS taskId,
lkc.proc_inst_id_out as procInsId, lkc.proc_inst_id_out as procInsId,
pcp.cons_user_id AS consUserId, pcp.cons_user_id AS consUserId,
@ -401,11 +400,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lkc.exit_reason as reason lkc.exit_reason as reason
FROM FROM
lk_cont_person lkc lk_cont_person lkc
LEFT JOIN LEFT JOIN pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
AND pcp.is_active = '1'
left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status ='0' left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status ='0'
WHERE lkc.into_status = '3' AND lkc.out_status != '0' WHERE lkc.into_status = '3' AND lkc.out_status != '0' AND pcp.is_active = '1'
<if test="bean.proId != null and bean.proId != ''"> <if test="bean.proId != null and bean.proId != ''">
and lkc.pro_id = #{bean.proId} and lkc.pro_id = #{bean.proId}
</if> </if>