diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 247f3d6..a7a0077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -30,9 +30,11 @@ @@ -90,12 +92,12 @@ and bor.measure_category = #{request.measureCategory} - and bor.create_user = #{request.createUser} + and su.name = #{request.createUser} - + AND bor.id IN - + #{item} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 247f3d6..a7a0077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -30,9 +30,11 @@ @@ -90,12 +92,12 @@ and bor.measure_category = #{request.measureCategory} - and bor.create_user = #{request.createUser} + and su.name = #{request.createUser} - + AND bor.id IN - + #{item} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 792e0fe..91824d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -158,4 +158,9 @@ @TableField(exist = false) @ApiModelProperty(value = "原始记录模板名称", dataType = "String") private String templateName; + + @TableField(exist = false) + @ApiModelProperty(value = "创建人名称", dataType = "String") + private String createUserName; + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 247f3d6..a7a0077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -30,9 +30,11 @@ @@ -90,12 +92,12 @@ and bor.measure_category = #{request.measureCategory} - and bor.create_user = #{request.createUser} + and su.name = #{request.createUser} - + AND bor.id IN - + #{item} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 792e0fe..91824d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -158,4 +158,9 @@ @TableField(exist = false) @ApiModelProperty(value = "原始记录模板名称", dataType = "String") private String templateName; + + @TableField(exist = false) + @ApiModelProperty(value = "创建人名称", dataType = "String") + private String createUserName; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 3910e78..28a12d9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -182,6 +182,7 @@ certificateReport.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 certificateReport.setProcessId(processInstance.getId()); certificateReport.setSubmitDate(DateUtil.formatDateTime(new Date())); + certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date())); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.CERTIFICATE_REPORT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.CERTIFICATE_REPORT_SUBMIT_FAILED.getMessage()); @@ -438,5 +439,6 @@ certificateReport.setMeasurePersonId(authUser.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); + certificateReport.setCreateTime(DateUtil.formatDateTime(new Date())); } }