diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 65e3fa1..246af44 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id @@ -57,7 +57,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 65e3fa1..246af44 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id @@ -57,7 +57,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java index 0d3590f..6c36bf5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java @@ -84,6 +84,9 @@ @ApiModelProperty(value = "联系人", dataType = "String") private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + @ApiModelProperty(value = "现场环境条件", dataType = "String") @TableField("executive_environment") private String executiveEnvironment; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 65e3fa1..246af44 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id @@ -57,7 +57,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java index 0d3590f..6c36bf5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java @@ -84,6 +84,9 @@ @ApiModelProperty(value = "联系人", dataType = "String") private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + @ApiModelProperty(value = "现场环境条件", dataType = "String") @TableField("executive_environment") private String executiveEnvironment; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java index 7968d74..a7bd1b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java @@ -72,7 +72,10 @@ private String director; @ApiModelProperty(value = "委托方电话", dataType = "String") - private String phone; + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; @ApiModelProperty(value = "预计计量费用", dataType = "String") private String preCost; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 65e3fa1..246af44 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id @@ -57,7 +57,7 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_phone AS customerPhone,deliverer + customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 )bo ON bo.orderId=order_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java index 0d3590f..6c36bf5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java @@ -84,6 +84,9 @@ @ApiModelProperty(value = "联系人", dataType = "String") private String deliverer; + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + @ApiModelProperty(value = "现场环境条件", dataType = "String") @TableField("executive_environment") private String executiveEnvironment; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java index 7968d74..a7bd1b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java @@ -72,7 +72,10 @@ private String director; @ApiModelProperty(value = "委托方电话", dataType = "String") - private String phone; + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; @ApiModelProperty(value = "预计计量费用", dataType = "String") private String preCost; 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 f53a9c0..840386e 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 @@ -198,8 +198,6 @@ AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.DRAFT); siteExecutiveInfo.setCreateUser(authUser.getId()); - siteExecutiveInfo.setDirectorId(authUser.getId()); - siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } @@ -228,6 +226,7 @@ businessSiteExecutiveDetail.setCustomerName(businessOrder.getCustomerName()); businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone()); businessSiteExecutiveDetail.setDeliverer(businessOrder.getDeliverer()); + businessSiteExecutiveDetail.setDelivererTel(businessOrder.getDelivererTel()); } private List handleApprovalStatus(Page page, SiteExecutiveApprovalListRequest request) {