经销商修改、新增、编辑回显联调。

外采提交流程新增接口返回data

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java

@@ -70,6 +70,9 @@ public class BaseDistributorLegalDto implements Dto {
     @ApiModelProperty(value = "通讯地址邮编", required = true)
     private String zipCode;
 
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
     @ApiModelProperty(value = "使用组织", required = true)
     private String useOrg;
     @ApiModelProperty(value = "使用组织Name", required = true)

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java

@@ -16,8 +16,8 @@ import java.util.List;
 @Data
 public class BaseDistributorLegalVo implements Vo {
 
-    @ApiModelProperty("经销商sid（陕汽必须字段）")
+    @ApiModelProperty("企业经销商sid")
-    private String distributorSid;
+    private String sid;
 
     @ApiModelProperty("userSid")
     private String userSid;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java

@@ -11,8 +11,8 @@ import java.util.List;
 @Data
 public class BaseDistributorPersonVo implements Vo {
 
-	@ApiModelProperty("经销商sid（陕汽必须字段）")
+	@ApiModelProperty("个人经销商sid")
-    private String distributorSid;
+    private String sid;
 
     @ApiModelProperty("userSid")
     private String userSid;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -92,6 +92,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
      */
     public ResultBean<String> saveFrDto(BaseDistributorLegalDto dto) {
         BaseDistributor baseDistributor = new BaseDistributor();
+        baseDistributor.setAddress(dto.getAddress());
         baseDistributor.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java

@@ -187,6 +187,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         baseDistributorLegalOneDto.setBusinessTermEndTime(dto.getBusinessTermEndTime());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setAddress(dto.getAddress());
         baseDistributorDto.setDistributorType(dto.getDistributorType());
         baseDistributorDto.setDistributorLevel(dto.getDistributorLevel());
         baseDistributorDto.setNumCode(dto.getNumCode());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java

@@ -158,6 +158,7 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         baseDistributorPersonOneDto.setRemarks(dto.getRemarks());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setZipCode(dto.getZipCode());
         baseDistributorDto.setNumCode(dto.getNumCode());
         baseDistributorDto.setDistributorName(dto.getDistributorName());
         baseDistributorDto.setAddress(dto.getAddress());
@@ -168,7 +169,7 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         if (count1 == 0 || count == 0) {
             return rb.setMsg("修改失败");
         }
-        baseDistributorAppendixService.delByLinkSid(sid);
+        baseDistributorAppendixService.delByLinkSid(baseDistributorPerson.getDistributorSid());
         for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
             BaseDistributorAppendix entity = new BaseDistributorAppendix();
             BeanUtil.copyProperties(baseDistributorAppendix, entity);
@@ -179,14 +180,14 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
             entity.setFilePath(filePath);
-            entity.setLinkSid(sid);
+            entity.setLinkSid(baseDistributorPerson.getDistributorSid());
             baseDistributorAppendixService.save(entity);
         }
-        baseDistributorBankService.delByDistributorSid(sid);
+        baseDistributorBankService.delByDistributorSid(baseDistributorPerson.getDistributorSid());
         for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
             BaseDistributorBank entity = new BaseDistributorBank();
             BeanUtil.copyProperties(baseDistributorBank, entity);
-            entity.setDistributorSid(sid);
+            entity.setDistributorSid(baseDistributorPerson.getDistributorSid());
             baseDistributorBankService.save(entity);
         }
         return rb.success().setMsg("修改成功");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -164,7 +164,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
 				baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
 			}
-			return rb.success().setMsg("添加成功");
+			return rb.success().setMsg("添加成功").setData(entity.getSid());
 		}
 		updateBySid(dto,sid);
 		baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);