diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java index 1a1ca66..44d647b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -143,6 +143,9 @@ @ApiModelProperty(value = "委托方手机", dataType = "String") private String customerPhone; + @ApiModelProperty(value = "送检人(联系人)", dataType = "String") + private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") private String delivererTel; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java index 1a1ca66..44d647b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -143,6 +143,9 @@ @ApiModelProperty(value = "委托方手机", dataType = "String") private String customerPhone; + @ApiModelProperty(value = "送检人(联系人)", dataType = "String") + private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") private String delivererTel; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index 393eebc..50d060c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -68,13 +68,6 @@ private String equipmentModel; /** - * 测量设备型号 - */ - @ApiModelProperty(value = "测量设备型号名称", dataType = "String") - @TableField(exist = false) - private String equipmentModelName; - - /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java index 1a1ca66..44d647b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -143,6 +143,9 @@ @ApiModelProperty(value = "委托方手机", dataType = "String") private String customerPhone; + @ApiModelProperty(value = "送检人(联系人)", dataType = "String") + private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") private String delivererTel; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index 393eebc..50d060c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -68,13 +68,6 @@ private String equipmentModel; /** - * 测量设备型号 - */ - @ApiModelProperty(value = "测量设备型号名称", dataType = "String") - @TableField(exist = false) - private String equipmentModelName; - - /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 55151fc..1c4b17f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -39,6 +39,7 @@ siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); + siteExecutiveEquipmentRelation.setEquipmentModel(assets.getEquipmentModel()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java index 1a1ca66..44d647b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -143,6 +143,9 @@ @ApiModelProperty(value = "委托方手机", dataType = "String") private String customerPhone; + @ApiModelProperty(value = "送检人(联系人)", dataType = "String") + private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") private String delivererTel; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index 393eebc..50d060c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -68,13 +68,6 @@ private String equipmentModel; /** - * 测量设备型号 - */ - @ApiModelProperty(value = "测量设备型号名称", dataType = "String") - @TableField(exist = false) - private String equipmentModelName; - - /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 55151fc..1c4b17f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -39,6 +39,7 @@ siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); + siteExecutiveEquipmentRelation.setEquipmentModel(assets.getEquipmentModel()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 56003d1..79a6580 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -113,7 +113,6 @@ siteExecutiveInfo.setId(request.getId()); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 siteExecutiveInfo.setProcessId(processInstance.getId()); - //siteExecutiveInfo.setSubmitDate(DateUtil.formatDateTime(new Date())); siteExecutiveInfo.setUpdateTime(DateUtil.formatDateTime(new Date())); int row = this.baseMapper.updateById(siteExecutiveInfo); if (row <= 0) { @@ -145,6 +144,9 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } if (this.baseMapper.updateById(siteExecutiveInfo) > 0) { baseApprovalService.failUpdate(siteExecutiveInfo.getProcessId()); return ReturnUtil.success(); @@ -180,6 +182,9 @@ @Override public ReturnDTO draftUpdate(BusinessSiteExecutiveInfo siteExecutiveInfo) { if (this.baseMapper.updateById(siteExecutiveInfo) > 0) { + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } //加入检测人员绑定 if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getMeterStaffList()) && siteExecutiveInfo.getMeterStaffList().size() > 0) { siteExecutiveStaffRelationService.saveBatch(siteExecutiveInfo.getId(), siteExecutiveInfo.getMeterStaffList()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java index 1a1ca66..44d647b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -143,6 +143,9 @@ @ApiModelProperty(value = "委托方手机", dataType = "String") private String customerPhone; + @ApiModelProperty(value = "送检人(联系人)", dataType = "String") + private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") private String delivererTel; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index 393eebc..50d060c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -68,13 +68,6 @@ private String equipmentModel; /** - * 测量设备型号 - */ - @ApiModelProperty(value = "测量设备型号名称", dataType = "String") - @TableField(exist = false) - private String equipmentModelName; - - /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 55151fc..1c4b17f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -39,6 +39,7 @@ siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getEquipmentId()); + siteExecutiveEquipmentRelation.setEquipmentModel(assets.getEquipmentModel()); siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 56003d1..79a6580 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -113,7 +113,6 @@ siteExecutiveInfo.setId(request.getId()); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 siteExecutiveInfo.setProcessId(processInstance.getId()); - //siteExecutiveInfo.setSubmitDate(DateUtil.formatDateTime(new Date())); siteExecutiveInfo.setUpdateTime(DateUtil.formatDateTime(new Date())); int row = this.baseMapper.updateById(siteExecutiveInfo); if (row <= 0) { @@ -145,6 +144,9 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } if (this.baseMapper.updateById(siteExecutiveInfo) > 0) { baseApprovalService.failUpdate(siteExecutiveInfo.getProcessId()); return ReturnUtil.success(); @@ -180,6 +182,9 @@ @Override public ReturnDTO draftUpdate(BusinessSiteExecutiveInfo siteExecutiveInfo) { if (this.baseMapper.updateById(siteExecutiveInfo) > 0) { + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } //加入检测人员绑定 if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getMeterStaffList()) && siteExecutiveInfo.getMeterStaffList().size() > 0) { siteExecutiveStaffRelationService.saveBatch(siteExecutiveInfo.getId(), siteExecutiveInfo.getMeterStaffList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 45f825d..1f43869 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -139,7 +139,6 @@ Collectors.toMap(EquipmentFixedAssets::getId, EquipmentFixedAssets::getEquipmentName) ); for (BusinessSiteExecutiveEquipmentRelation siteExecutiveLog : businessSiteExecutiveEquipments) { - DictCodeUtils.convertDictCodeToName(siteExecutiveLog); siteExecutiveLog.setEquipmentName(equipmentFixedAssetMap.get(siteExecutiveLog.getEquipmentId())); } businessSiteExecutiveLogDetail.setSiteExecutiveEquipmentRelationList(businessSiteExecutiveEquipments); @@ -186,6 +185,7 @@ businessSiteExecutiveLogDetail.setCustomerAddress(businessOrder.getCustomerAddress()); businessSiteExecutiveLogDetail.setCustomerName(businessOrder.getCustomerName()); businessSiteExecutiveLogDetail.setCustomerPhone(businessOrder.getCustomerPhone()); + businessSiteExecutiveLogDetail.setDeliverer(businessOrder.getDeliverer()); businessSiteExecutiveLogDetail.setDelivererTel(businessOrder.getDelivererTel()); businessSiteExecutiveLogDetail.setOrderCode(businessOrder.getOrderCode()); businessSiteExecutiveLogDetail.setCustomerNo(businessOrder.getCustomerNo());