diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index dec7e6f..365624e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,9 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index dec7e6f..365624e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,9 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + and msa.id in diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java index cbe2548..433fd4d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java @@ -78,4 +78,10 @@ */ @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List") private List businessKeys; + + /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index dec7e6f..365624e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,9 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + and msa.id in diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java index cbe2548..433fd4d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java @@ -78,4 +78,10 @@ */ @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List") private List businessKeys; + + /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java index 4295802..2a0cbc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java @@ -182,4 +182,11 @@ @ApiModelProperty(value = "附件列表", dataType = "List") private List fileList; + /** + * 任务id + */ + @TableField(exist = false) + @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") + private String taskId; + } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index dec7e6f..365624e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,9 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + and msa.id in diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java index cbe2548..433fd4d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageRequest.java @@ -78,4 +78,10 @@ */ @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List") private List businessKeys; + + /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java index 4295802..2a0cbc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStateManageResponse.java @@ -182,4 +182,11 @@ @ApiModelProperty(value = "附件列表", dataType = "List") private List fileList; + /** + * 任务id + */ + @TableField(exist = false) + @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") + private String taskId; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStateManageServiceImpl.java index 16179c9..2a1699e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStateManageServiceImpl.java @@ -77,9 +77,24 @@ searchBusinessKey = false; break; } - - + if(searchBusinessKey){ + request.setApprovalStatus(null); + if(!CollectionUtils.isEmpty(businessKeys)){ + request.setBusinessKeys(businessKeys); + }else{ + return page; + } + } resultPage = stateManageMapper.stateManageList(page,request); + for (MeterStateManageResponse item: resultPage.getRecords()) { + if(searchBusinessKey){ + item.setApprovalStatus(status); + } + if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ + item.setTaskId(taskMap.get(item.getId().toString())); + } + DictCodeUtils.convertDictCodeToName(item); + } for (MeterStateManageResponse stateManageResponse : resultPage.getRecords()) { DictCodeUtils.convertDictCodeToName(stateManageResponse); }