diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java index fe6f858..6319a37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java @@ -222,4 +222,10 @@ @TableField(exist = false) @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java index fe6f858..6319a37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java @@ -222,4 +222,10 @@ @TableField(exist = false) @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7d80255..037eaae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -86,6 +86,7 @@ List businessKeys = new ArrayList<>(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map String status = request.getApprovalStatus(); switch (status){ // 待审批 获取业务id,以及taskId @@ -93,6 +94,7 @@ List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; // 审批中 case ApprovalStatusEnum.IN_APPROVED: @@ -147,6 +149,7 @@ // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java index fe6f858..6319a37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java @@ -222,4 +222,10 @@ @TableField(exist = false) @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7d80255..037eaae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -86,6 +86,7 @@ List businessKeys = new ArrayList<>(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map String status = request.getApprovalStatus(); switch (status){ // 待审批 获取业务id,以及taskId @@ -93,6 +94,7 @@ List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; // 审批中 case ApprovalStatusEnum.IN_APPROVED: @@ -147,6 +149,7 @@ // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 6a02d14..5a160b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; @@ -82,12 +83,14 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -134,6 +137,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); @@ -151,6 +155,9 @@ DictCodeUtils.convertDictCodeToName(equipmentApply); // 查询设备详细信息 List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) { + DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); + } equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -266,12 +273,14 @@ @Override public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ - resultList = this.listByIds(request.getIds()); + EquipmentApplyRequest applyRequest = new EquipmentApplyRequest(); + applyRequest.setIds(request.getIds()); + resultList = equipmentApplyMapper.equipmentApplyList(applyRequest); }else{ - List businessKeys = baseApprovalService.getPassedList(request.getFormId()); - request.setBusinessKeys(businessKeys); + request.setBusinessKeys(getBusinessKeys(request)); resultList = equipmentApplyMapper.equipmentApplyList(request); } for (EquipmentApply equipmentApply : resultList) { @@ -363,4 +372,39 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private List getBusinessKeys(EquipmentApplyRequest request) { + List businessKeys; + List rejectBusinessKey; + switch (request.getApprovalStatus()) { + case ApprovalStatusEnum.TO_BE_APPROVED: + List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + case ApprovalStatusEnum.IN_APPROVED: + businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); + break; + case ApprovalStatusEnum.PASSED: + businessKeys = baseApprovalService.getPassedList(request.getFormId()); + break; + case ApprovalStatusEnum.FAILED: + businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); + break; + case ApprovalStatusEnum.CANCELED: + businessKeys = baseApprovalService.getCanceledList(request.getFormId()); + break; + case ApprovalStatusEnum.ALL: + List allList = baseApprovalService.getAllList(request.getFormId()); + businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + default: + businessKeys = new ArrayList<>(); + break; + } + if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){ + request.setApprovalStatus(null); + } + return businessKeys; + } } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java index fe6f858..6319a37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java @@ -222,4 +222,10 @@ @TableField(exist = false) @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7d80255..037eaae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -86,6 +86,7 @@ List businessKeys = new ArrayList<>(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map String status = request.getApprovalStatus(); switch (status){ // 待审批 获取业务id,以及taskId @@ -93,6 +94,7 @@ List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; // 审批中 case ApprovalStatusEnum.IN_APPROVED: @@ -147,6 +149,7 @@ // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 6a02d14..5a160b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; @@ -82,12 +83,14 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -134,6 +137,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); @@ -151,6 +155,9 @@ DictCodeUtils.convertDictCodeToName(equipmentApply); // 查询设备详细信息 List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) { + DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); + } equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -266,12 +273,14 @@ @Override public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ - resultList = this.listByIds(request.getIds()); + EquipmentApplyRequest applyRequest = new EquipmentApplyRequest(); + applyRequest.setIds(request.getIds()); + resultList = equipmentApplyMapper.equipmentApplyList(applyRequest); }else{ - List businessKeys = baseApprovalService.getPassedList(request.getFormId()); - request.setBusinessKeys(businessKeys); + request.setBusinessKeys(getBusinessKeys(request)); resultList = equipmentApplyMapper.equipmentApplyList(request); } for (EquipmentApply equipmentApply : resultList) { @@ -363,4 +372,39 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private List getBusinessKeys(EquipmentApplyRequest request) { + List businessKeys; + List rejectBusinessKey; + switch (request.getApprovalStatus()) { + case ApprovalStatusEnum.TO_BE_APPROVED: + List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + case ApprovalStatusEnum.IN_APPROVED: + businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); + break; + case ApprovalStatusEnum.PASSED: + businessKeys = baseApprovalService.getPassedList(request.getFormId()); + break; + case ApprovalStatusEnum.FAILED: + businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); + break; + case ApprovalStatusEnum.CANCELED: + businessKeys = baseApprovalService.getCanceledList(request.getFormId()); + break; + case ApprovalStatusEnum.ALL: + List allList = baseApprovalService.getAllList(request.getFormId()); + businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + default: + businessKeys = new ArrayList<>(); + break; + } + if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){ + request.setApprovalStatus(null); + } + return businessKeys; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index 71678ff..6225d4e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -96,6 +96,7 @@ String status = request.getApprovalStatus(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -103,6 +104,7 @@ businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -147,6 +149,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString())); + item.setDecisionItem(decisionItemMap.get(item.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ item.setApprovalStatus(taskMap.get(String.valueOf(item.getId()))); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 12791f0..5ce4173 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -10,11 +10,15 @@ mfa.mesure_range, mfa.use_dept, mfa.use_person, + sd.SIMPLE_NAME as use_dept_name, + su.`NAME` as use_person_name, mfa.manager_state, mfa.valid_date FROM equipment_apply_equipment msae - LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id + LEFT JOIN sys_user su ON su.id = mfa.use_person + LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 9cf0635..7743414 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -153,4 +153,10 @@ @ApiModelProperty(value = "附件列表", dataType = "List") List fileList; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 5a92457..24ff4b5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -189,4 +189,10 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index 704ae7b..2ecd626 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -233,4 +233,10 @@ @ApiModelProperty(value = "检修申请id", dataType = "String") private String acceptanceCheckId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java index fe6f858..6319a37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java @@ -222,4 +222,10 @@ @TableField(exist = false) @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7d80255..037eaae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -86,6 +86,7 @@ List businessKeys = new ArrayList<>(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map String status = request.getApprovalStatus(); switch (status){ // 待审批 获取业务id,以及taskId @@ -93,6 +94,7 @@ List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; // 审批中 case ApprovalStatusEnum.IN_APPROVED: @@ -147,6 +149,7 @@ // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 6a02d14..5a160b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; @@ -82,12 +83,14 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -134,6 +137,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString())); + equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId()))); @@ -151,6 +155,9 @@ DictCodeUtils.convertDictCodeToName(equipmentApply); // 查询设备详细信息 List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) { + DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); + } equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -266,12 +273,14 @@ @Override public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ - resultList = this.listByIds(request.getIds()); + EquipmentApplyRequest applyRequest = new EquipmentApplyRequest(); + applyRequest.setIds(request.getIds()); + resultList = equipmentApplyMapper.equipmentApplyList(applyRequest); }else{ - List businessKeys = baseApprovalService.getPassedList(request.getFormId()); - request.setBusinessKeys(businessKeys); + request.setBusinessKeys(getBusinessKeys(request)); resultList = equipmentApplyMapper.equipmentApplyList(request); } for (EquipmentApply equipmentApply : resultList) { @@ -363,4 +372,39 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private List getBusinessKeys(EquipmentApplyRequest request) { + List businessKeys; + List rejectBusinessKey; + switch (request.getApprovalStatus()) { + case ApprovalStatusEnum.TO_BE_APPROVED: + List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + case ApprovalStatusEnum.IN_APPROVED: + businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); + break; + case ApprovalStatusEnum.PASSED: + businessKeys = baseApprovalService.getPassedList(request.getFormId()); + break; + case ApprovalStatusEnum.FAILED: + businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); + break; + case ApprovalStatusEnum.CANCELED: + businessKeys = baseApprovalService.getCanceledList(request.getFormId()); + break; + case ApprovalStatusEnum.ALL: + List allList = baseApprovalService.getAllList(request.getFormId()); + businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList()); + break; + default: + businessKeys = new ArrayList<>(); + break; + } + if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){ + request.setApprovalStatus(null); + } + return businessKeys; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index 71678ff..6225d4e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -96,6 +96,7 @@ String status = request.getApprovalStatus(); List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + Map decisionItemMap = new HashMap<>(); // 可选决策项map switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -103,6 +104,7 @@ businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -147,6 +149,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString())); + item.setDecisionItem(decisionItemMap.get(item.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ item.setApprovalStatus(taskMap.get(String.valueOf(item.getId()))); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index c9bbbff..047f173 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -48,6 +48,7 @@ String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 + Map decisionItemMap = new HashMap<>(); // 可选决策项map switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -55,6 +56,7 @@ businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());}); + toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());}); break; case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); @@ -99,6 +101,7 @@ } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString())); + item.setDecisionItem(decisionItemMap.get(item.getId().toString())); } if(ApprovalStatusEnum.ALL.equals(status)){ item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));