diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index fbbb2e2..507f4ad 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -39,11 +39,15 @@ WHERE 1=1 and bop.apply_approval_status = #{request.approvalStatus} - and bop.applicant_id = #{request.createUserId} + + and bop.applicant_id = #{request.createUserId} + and bop.check_approval_status = #{request.approvalStatus} - and bop.checker_id = #{request.createUserId} + + and bop.checker_id = #{request.createUserId} + and bop.project_no like concat('%',#{request.projectNo},'%') @@ -76,6 +80,12 @@ FROM business_outsource_project bop LEFT JOIN business_outsourcer_info boi ON bop.outsourcer_id = boi.id WHERE 1=1 + + and bop.applicant_id = #{request.applicantId} + + + and bop.checker_id = #{request.checkerId} + and bop.project_no like concat('%',#{request.projectNo},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index fbbb2e2..507f4ad 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -39,11 +39,15 @@ WHERE 1=1 and bop.apply_approval_status = #{request.approvalStatus} - and bop.applicant_id = #{request.createUserId} + + and bop.applicant_id = #{request.createUserId} + and bop.check_approval_status = #{request.approvalStatus} - and bop.checker_id = #{request.createUserId} + + and bop.checker_id = #{request.createUserId} + and bop.project_no like concat('%',#{request.projectNo},'%') @@ -76,6 +80,12 @@ FROM business_outsource_project bop LEFT JOIN business_outsourcer_info boi ON bop.outsourcer_id = boi.id WHERE 1=1 + + and bop.applicant_id = #{request.applicantId} + + + and bop.checker_id = #{request.checkerId} + and bop.project_no like concat('%',#{request.projectNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java index 94c2412..19b2dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java @@ -56,4 +56,10 @@ //标识是申请or验收，代码中设置 @ApiModelProperty(hidden = true) private Integer typeFlag; + //代码中过渡申请人使用 + @ApiModelProperty(hidden = true) + private Long applicantId; + //代码中过渡验收人使用 + @ApiModelProperty(hidden = true) + private Long checkerId; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index fbbb2e2..507f4ad 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -39,11 +39,15 @@ WHERE 1=1 and bop.apply_approval_status = #{request.approvalStatus} - and bop.applicant_id = #{request.createUserId} + + and bop.applicant_id = #{request.createUserId} + and bop.check_approval_status = #{request.approvalStatus} - and bop.checker_id = #{request.createUserId} + + and bop.checker_id = #{request.createUserId} + and bop.project_no like concat('%',#{request.projectNo},'%') @@ -76,6 +80,12 @@ FROM business_outsource_project bop LEFT JOIN business_outsourcer_info boi ON bop.outsourcer_id = boi.id WHERE 1=1 + + and bop.applicant_id = #{request.applicantId} + + + and bop.checker_id = #{request.checkerId} + and bop.project_no like concat('%',#{request.projectNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java index 94c2412..19b2dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java @@ -56,4 +56,10 @@ //标识是申请or验收，代码中设置 @ApiModelProperty(hidden = true) private Integer typeFlag; + //代码中过渡申请人使用 + @ApiModelProperty(hidden = true) + private Long applicantId; + //代码中过渡验收人使用 + @ApiModelProperty(hidden = true) + private Long checkerId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index d464dc5..33bd251 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -52,17 +52,17 @@ private String applicantTime; // @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典code（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatus; - @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典value（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatusName; // @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典code（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatus; - @ApiModelProperty(value = "分包项目验收审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典value（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatusName; @ApiModelProperty(value = "分包项目申请流程实例id", dataType = "String") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index fbbb2e2..507f4ad 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -39,11 +39,15 @@ WHERE 1=1 and bop.apply_approval_status = #{request.approvalStatus} - and bop.applicant_id = #{request.createUserId} + + and bop.applicant_id = #{request.createUserId} + and bop.check_approval_status = #{request.approvalStatus} - and bop.checker_id = #{request.createUserId} + + and bop.checker_id = #{request.createUserId} + and bop.project_no like concat('%',#{request.projectNo},'%') @@ -76,6 +80,12 @@ FROM business_outsource_project bop LEFT JOIN business_outsourcer_info boi ON bop.outsourcer_id = boi.id WHERE 1=1 + + and bop.applicant_id = #{request.applicantId} + + + and bop.checker_id = #{request.checkerId} + and bop.project_no like concat('%',#{request.projectNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java index 94c2412..19b2dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java @@ -56,4 +56,10 @@ //标识是申请or验收，代码中设置 @ApiModelProperty(hidden = true) private Integer typeFlag; + //代码中过渡申请人使用 + @ApiModelProperty(hidden = true) + private Long applicantId; + //代码中过渡验收人使用 + @ApiModelProperty(hidden = true) + private Long checkerId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index d464dc5..33bd251 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -52,17 +52,17 @@ private String applicantTime; // @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典code（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatus; - @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典value（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatusName; // @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典code（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatus; - @ApiModelProperty(value = "分包项目验收审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典value（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatusName; @ApiModelProperty(value = "分包项目申请流程实例id", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java index 710194d..003041a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -101,7 +101,7 @@ private String verifierCertificateNo; @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") + @ApiModelProperty(value = "有效日期（关联查询证书时赋值给这里的）", dataType = "String") @ExcelProperty(value = "证书有效日期",order = 9) private String certificateDate; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index dc8bab0..b4e182d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(1); + request.setApplicantId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index 2ec89ec..76021e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -53,6 +53,7 @@ DictCodeUtils.validDictCode(request); Page page = PageFactory.defaultPage(); request.setTypeFlag(2); + request.setCheckerId(request.getCreateUserId()); List responseList = projectService.projectApplyApprovalListPage(request, page); page.setRecords(responseList); return ReturnUtil.success(super.packForBT(page)); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index fbbb2e2..507f4ad 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -39,11 +39,15 @@ WHERE 1=1 and bop.apply_approval_status = #{request.approvalStatus} - and bop.applicant_id = #{request.createUserId} + + and bop.applicant_id = #{request.createUserId} + and bop.check_approval_status = #{request.approvalStatus} - and bop.checker_id = #{request.createUserId} + + and bop.checker_id = #{request.createUserId} + and bop.project_no like concat('%',#{request.projectNo},'%') @@ -76,6 +80,12 @@ FROM business_outsource_project bop LEFT JOIN business_outsourcer_info boi ON bop.outsourcer_id = boi.id WHERE 1=1 + + and bop.applicant_id = #{request.applicantId} + + + and bop.checker_id = #{request.checkerId} + and bop.project_no like concat('%',#{request.projectNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java index 94c2412..19b2dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java @@ -56,4 +56,10 @@ //标识是申请or验收，代码中设置 @ApiModelProperty(hidden = true) private Integer typeFlag; + //代码中过渡申请人使用 + @ApiModelProperty(hidden = true) + private Long applicantId; + //代码中过渡验收人使用 + @ApiModelProperty(hidden = true) + private Long checkerId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index d464dc5..33bd251 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -52,17 +52,17 @@ private String applicantTime; // @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典code（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatus; - @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目申请审批状态类型-字典value（查询验收流程时该状态无意义）", dataType = "String") private String applyApprovalStatusName; // @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) - @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典code（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatus; - @ApiModelProperty(value = "分包项目验收审批状态类型-字典value", dataType = "String") + @ApiModelProperty(value = "分包项目验收审批状态类型-字典value（查询申请流程时该状态无意义）", dataType = "String") private String checkApprovalStatusName; @ApiModelProperty(value = "分包项目申请流程实例id", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java index 710194d..003041a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -101,7 +101,7 @@ private String verifierCertificateNo; @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") + @ApiModelProperty(value = "有效日期（关联查询证书时赋值给这里的）", dataType = "String") @ExcelProperty(value = "证书有效日期",order = 9) private String certificateDate; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 3ff71ab..6855e6e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -445,13 +445,13 @@ //区分管理员和普通用户 //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: - List AllApproveList = baseApprovalService.getAllList(request.getFormId()); - if (!CollectionUtils.isEmpty(AllApproveList)) { - businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList()); + List allApproveList = baseApprovalService.getAllList(request.getFormId()); + if (!CollectionUtils.isEmpty(allApproveList)) { + businessKeys = allApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList()); } if (!CollectionUtils.isEmpty(businessKeys)) { list = projectMapper.selectBatchForApproval(page, request, businessKeys); - approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList); + approvalList = handleAllApprovalListResponse(approvalList, list, allApproveList); } break; } @@ -483,6 +483,8 @@ approvalList.forEach(approval -> { approval.setApplyApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId())))); approval.setApplyApprovalStatus(taskMap.get(String.valueOf(approval.getId()))); + approval.setCheckApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId())))); + approval.setCheckApprovalStatus(taskMap.get(String.valueOf(approval.getId()))); }); //排序 return approvalList.stream().sorted(Comparator.comparing(OutsourceProjectApprovalListResponse::getCreateTime).reversed()).collect(Collectors.toList());