From 08f08860b61cb6bc6fe164d9fecae8d4b80b014a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 22 Sep 2022 11:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/AppCrmCustomerFileDto.java | 34 +++++++++---------- .../commoncontract/CommonContractService.java | 7 ---- .../app/AppBusSalesOrderModelDto.java | 1 - .../BusSalesOrderModelService.java | 4 ++- .../biz/sysstaffinfo/SysStaffinfoService.java | 4 +++ .../ScmVehicleGressionService.java | 4 +-- .../contract/CrmCustomerFileDto.java | 13 ++++--- .../saleOrders/model/ModelDto.java | 1 + 8 files changed, 32 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java index 0d6606959f..c7eb542d2b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java @@ -1,11 +1,9 @@ package com.yxt.anrui.base.api.commoncontract; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @Data @@ -14,23 +12,23 @@ public class AppCrmCustomerFileDto implements Dto { @ApiModelProperty("合同sid") private String contractSid; - @ApiModelProperty("单台价格") - private BigDecimal price; +/* @ApiModelProperty("单台价格") + private BigDecimal price;*/ - @ApiModelProperty("数量") - private String number; +/* @ApiModelProperty("数量") + private String number;*/ - @ApiModelProperty("车型") - private String model; +/* @ApiModelProperty("车型") + private String model;*/ - @ApiModelProperty("乙方名称") - private String partyB; +/* @ApiModelProperty("乙方名称") + private String partyB;*/ - @ApiModelProperty("合同编号") - private String contractId; +/* @ApiModelProperty("合同编号") + private String contractId;*/ - @ApiModelProperty("合同价格") - private String contractPrice; +/* @ApiModelProperty("合同价格") + private String contractPrice;*/ @ApiModelProperty("新车买卖合同") private List contractImages; @@ -41,8 +39,8 @@ public class AppCrmCustomerFileDto implements Dto { @ApiModelProperty("身份证图片") private List idCardImages; - @ApiModelProperty("客户类型") - private String customerKey; + /* @ApiModelProperty("客户类型") + private String customerKey;*/ @ApiModelProperty("任务id") private String taskId; @@ -56,8 +54,8 @@ public class AppCrmCustomerFileDto implements Dto { @ApiModelProperty("是否是档案库里的身份证") private boolean idCardArchives; - @ApiModelProperty("客户sid") - private String customerSid; +/* @ApiModelProperty("客户sid") + private String customerSid;*/ @ApiModelProperty("合同附件") private String appdixUrl; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 6cacfbe296..2951c79e80 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1087,13 +1087,6 @@ public class CommonContractService extends MybatisBaseService staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid); + sysStaffOrg = staffOrgResultBean.getData(); + } BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); sysStaffOrg.setManageType("3"); sysStaffOrgService.updateById(sysStaffOrg); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 2e697c6bd5..0281704366 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -687,7 +687,7 @@ public class ScmVehicleGressionService extends MybatisBaseService carSidListO = baseVehicleTempstateFeign.selectAllOne("001").getData(); if (carSidListO.size() > 0) { - if (carSidListO.contains(sid)) { + if (carSidListO.contains(v.getVehSid())) { return rb.setMsg("车架号为" + v.getVehVin() + "的车辆存放地点变更正在审批中,不允许提交"); } } @@ -695,7 +695,7 @@ public class ScmVehicleGressionService extends MybatisBaseService carSidListO = baseVehicleTempstateFeign.selectAllOne("001").getData(); if (carSidListO.size() > 0) { - if (carSidListO.contains(sid)) { + if (carSidListO.contains(v.getVehSid())) { return rb.setMsg("车架号为" + v.getVehVin() + "的车辆存放地点变更正在审批中,不允许提交"); } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java index 29b93600ea..cc77d47b2c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java @@ -4,7 +4,6 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @Data @@ -16,7 +15,7 @@ public class CrmCustomerFileDto implements Dto { @ApiModelProperty("合同sid") private String contractSid; - @ApiModelProperty("单台价格") + /* @ApiModelProperty("单台价格") private BigDecimal price; @ApiModelProperty("数量") @@ -32,7 +31,7 @@ public class CrmCustomerFileDto implements Dto { private String contractId; @ApiModelProperty("合同价格") - private String contractPrice; + private String contractPrice;*/ @ApiModelProperty("新车买卖合同") private List contractImages; @@ -43,8 +42,8 @@ public class CrmCustomerFileDto implements Dto { @ApiModelProperty("身份证图片") private List idCardImages; - @ApiModelProperty("客户类型") - private String customerKey; + /* @ApiModelProperty("客户类型") + private String customerKey;*/ @ApiModelProperty("任务id") private String taskId; @@ -58,8 +57,8 @@ public class CrmCustomerFileDto implements Dto { @ApiModelProperty("是否是档案库里的身份证") private boolean idCardArchives; - @ApiModelProperty("客户sid") - private String customerSid; + /*@ApiModelProperty("客户sid") + private String customerSid;*/ @ApiModelProperty("合同附件") private String appdixUrl; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java index 401d17c9d5..d30dccef8c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java @@ -34,6 +34,7 @@ public class ModelDto implements Dto { @ApiModelProperty(value = "销售指导价") @JsonProperty(value = "price") + @NotBlank(message = "参数错误：销售指导价不能为空") private String guildPrice;