修复移动端问题

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("单台价格")
+/*    @ApiModelProperty("单台价格")
-    private BigDecimal price;
+    private BigDecimal price;*/
 
-    @ApiModelProperty("数量")
+/*    @ApiModelProperty("数量")
-    private String number;
+    private String number;*/
 
-    @ApiModelProperty("车型")
+/*    @ApiModelProperty("车型")
-    private String model;
+    private String model;*/
 
-    @ApiModelProperty("乙方名称")
+/*    @ApiModelProperty("乙方名称")
-    private String partyB;
+    private String partyB;*/
 
-    @ApiModelProperty("合同编号")
+/*    @ApiModelProperty("合同编号")
-    private String contractId;
+    private String contractId;*/
 
-    @ApiModelProperty("合同价格")
+/*    @ApiModelProperty("合同价格")
-    private String contractPrice;
+    private String contractPrice;*/
 
     @ApiModelProperty("新车买卖合同")
     private List<String> contractImages;
@@ -41,8 +39,8 @@ public class AppCrmCustomerFileDto implements Dto {
     @ApiModelProperty("身份证图片")
     private List<String> idCardImages;
 
-    @ApiModelProperty("客户类型")
+  /*  @ApiModelProperty("客户类型")
-    private String customerKey;
+    private String customerKey;*/
 
     @ApiModelProperty("任务id")
     private String taskId;
@@ -56,8 +54,8 @@ public class AppCrmCustomerFileDto implements Dto {
     @ApiModelProperty("是否是档案库里的身份证")
     private boolean idCardArchives;
 
-    @ApiModelProperty("客户sid")
+/*    @ApiModelProperty("客户sid")
-    private String customerSid;
+    private String customerSid;*/
 
     @ApiModelProperty("合同附件")
     private String appdixUrl;

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<CommonContractMapp
         ResultBean rb = ResultBean.fireFail();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
         CommonContract commonContract = fetchBySid(dto.getContractSid());
-        commonContract.setContractNo(dto.getContractId());
-        commonContract.setPrice(dto.getPrice());
-        commonContract.setNum(Integer.valueOf(dto.getNumber()));
-        commonContract.setModelName(dto.getModel());
-        commonContract.setPartyB(dto.getPartyB());
-        commonContract.setContractAmount(dto.getContractPrice());
-        commonContract.setCustomerSid(dto.getCustomerSid());
         commonContract.setStaffSid(dto.getUserSid());
         commonContract.setStaffName(data.getStaffName());
         commonContract.setOrgSid(data.getOrgSid());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppBusSalesOrderModelDto.java

@@ -36,7 +36,6 @@ public class AppBusSalesOrderModelDto implements Dto {
     private String arrangeNumber;
 
     @ApiModelProperty(value = "销售指导价")
-//    @JsonProperty(value = "price")
     private String guildPrice;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -170,7 +170,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             }
         } else {
             BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");
+            if(StringUtils.isNotBlank(dto.getGuildPrice())){
                 busSalesOrderModel.setGuildPrice(new BigDecimal(dto.getGuildPrice()));
+            }
             busSalesOrderModel.setBrandSid(brandSid);
             busSalesOrderModel.setBrandName(brandName);
             busSalesOrderModel.setModelConfig(modelAlias);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -527,6 +527,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2");
         }
         SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath());
+        if(sysStaffOrg == null){
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
+            sysStaffOrg = staffOrgResultBean.getData();
+        }
         BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
         sysStaffOrg.setManageType("3");
         sysStaffOrgService.updateById(sysStaffOrg);

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<ScmVehicleGres
                 if (r == 1) {
                     List<String> 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<ScmVehicleGres
                     if (!vv.getBusSid().equals(scmVehicleGression.getSid())) {
                         List<String> carSidListO = baseVehicleTempstateFeign.selectAllOne("001").getData();
                         if (carSidListO.size() > 0) {
-                            if (carSidListO.contains(sid)) {
+                            if (carSidListO.contains(v.getVehSid())) {
                                 return rb.setMsg("车架号为" + v.getVehVin() + "的车辆存放地点变更正在审批中,不允许提交");
                             }
                         }

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<String> contractImages;
@@ -43,8 +42,8 @@ public class CrmCustomerFileDto implements Dto {
     @ApiModelProperty("身份证图片")
     private List<String> idCardImages;
 
-    @ApiModelProperty("客户类型")
+   /* @ApiModelProperty("客户类型")
-    private String customerKey;
+    private String customerKey;*/
 
     @ApiModelProperty("任务id")
     private String taskId;
@@ -58,8 +57,8 @@ public class CrmCustomerFileDto implements Dto {
     @ApiModelProperty("是否是档案库里的身份证")
     private boolean idCardArchives;
 
-    @ApiModelProperty("客户sid")
+    /*@ApiModelProperty("客户sid")
-    private String customerSid;
+    private String customerSid;*/
 
     @ApiModelProperty("合同附件")
     private String appdixUrl;

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;