diff --git a/src/main/java/com/biutag/supervision/flow/action/SaveAction.java b/src/main/java/com/biutag/supervision/flow/action/SaveAction.java index 8822225..ba85795 100644 --- a/src/main/java/com/biutag/supervision/flow/action/SaveAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/SaveAction.java @@ -23,6 +23,7 @@ public class SaveAction implements Action { public void next(ActionDto actionDto) { VerifyData verifyData = BeanUtil.toBean(actionDto.getData(), VerifyData.class); Negative negative = negativeService.getById(actionDto.getNegativeId()); + verifyData.setSkipInitView(true); applyCompletionAction.updateNegative(negative, verifyData); } diff --git a/src/main/resources/mapper/ComplaintCollectionMapper.xml b/src/main/resources/mapper/ComplaintCollectionMapper.xml index 7c4be41..b075086 100644 --- a/src/main/resources/mapper/ComplaintCollectionMapper.xml +++ b/src/main/resources/mapper/ComplaintCollectionMapper.xml @@ -222,13 +222,19 @@ n.check_status_code AS checkStatusCode, n.checkStatusName AS checkStatusName, n.check_status_desc AS checkStatusDesc, - n.involveDepartName AS involveDepartName, + -- 涉及单位名称:如果部门是3级则拼接父级名称 + CONCAT( + CASE WHEN sd_involve.level = 3 THEN CONCAT(sd_parent.name, '/') ELSE '' END, + n.involveDepartName + ) AS involveDepartName, n.handle_second_depart_id AS handleSecondDepartId, n.handle_second_depart_name AS handleSecondDepartName, n.handle_three_depart_id AS handleThreeDepartId, n.handle_three_depart_name AS handleThreeDepartName FROM complaint_collection cc LEFT JOIN negative n ON n.id = cc.negative_id + LEFT JOIN sup_depart sd_involve ON sd_involve.id = n.involveDepartId + LEFT JOIN sup_depart sd_parent ON sd_parent.id = sd_involve.pid AND cc.source_table = #{param.sourceTable}