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

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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java

@@ -39,8 +39,11 @@ public class BaseDistributorDto implements Dto {
     @ApiModelProperty("经销商类型Value值")
     private String distributorTypeValue;
     
-	@ApiModelProperty("经销商等级（陕汽必须字段）")
+	@ApiModelProperty("经销商等级key（陕汽必须字段）")
     private String distributorLevel;
+
+    @ApiModelProperty("经销商等级value（陕汽必须字段）")
+    private String distributorLevelValue;
     
 	@ApiModelProperty("证书号码（法人为统一社会信用代码/个人为身份证号）（陕汽必须字段）")
     private String numCode;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -97,4 +97,7 @@ public class BaseOutsourcingApplication extends BaseEntity {
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -104,6 +104,9 @@ public class BaseOutsourcingApplicationDto implements Dto {
 
 	@ApiModelProperty(value = "节点状态")
 	private String nodeState;
+
+	@ApiModelProperty("分公司sid")
+	private String useOrgSid; // 分公司sid
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java

@@ -80,11 +80,11 @@ public interface BaseOutsourcingApplicationFeign {
 
     @ApiOperation("政策外采车辆选择列表")
     @GetMapping("/fetchVehicle")
-    public ResultBean<BaseVehicleVo> fetchVehicle(@RequestParam("vehicleSid") String vehicleSid);
+    public ResultBean<BaseVehicleVo> fetchVehicle(@RequestParam("vehicleSid") String vehicleSid,@RequestParam("modelSid") String modelSid);
 
     /*************************流程审批**************************/
 
-    @ApiOperation("提交盖章申请审批流程")
+    @ApiOperation("提交外采申请审批流程")
     @PostMapping("/submitBaseOutSourcingApplication")
     public ResultBean submitBaseOutSourcingApplication(@RequestBody @Valid SubmitBaseOutSourcingApplicationDto dto);
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java

@@ -73,7 +73,7 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA
 	}
 
 	@Override
-	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid,String modelSid) {
 		return null;
 	}
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.Map;
@@ -41,5 +42,4 @@ public interface BaseDistributorLegalMapper extends BaseMapper<BaseDistributorLe
      * @return
      */
     BaseDistributorLegalVo details(String sid);
-
 }

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

@@ -187,6 +187,11 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         baseDistributorLegalOneDto.setBusinessTermEndTime(dto.getBusinessTermEndTime());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setDistributorName(dto.getDistributorName());
+        baseDistributorDto.setDistributorType(dto.getDistributorType());
+        baseDistributorDto.setDistributorTypeValue(dto.getDistributorTypeValue());
+        baseDistributorDto.setDistributorLevel(dto.getDistributorLevel());
+        baseDistributorDto.setDistributorLevelValue(dto.getDistributorLevelValue());
         baseDistributorDto.setAddress(dto.getAddress());
         baseDistributorDto.setDistributorType(dto.getDistributorType());
         baseDistributorDto.setDistributorLevel(dto.getDistributorLevel());
@@ -208,14 +213,14 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
                 BaseDistributorStaffDto baseDistributorStaffDto = dto.getList().get(i);
                 BaseDistributorStaff baseDistributorStaff = new BaseDistributorStaff();
                 baseDistributorStaff.setDistributorSid(sid);
-                baseDistributorStaffDto.fillEntity(baseDistributorStaff);
+                BeanUtil.copyProperties(baseDistributorStaffDto,baseDistributorStaff);
                 baseDistributorStaffService.save(baseDistributorStaff);
             }
         }
         if (count1 == 0 || count == 0) {
             return rb.setMsg("修改失败");
         }
-        baseDistributorAppendixService.delByLinkSid(sid);
+        baseDistributorAppendixService.delByLinkSid(baseDistributorLegal.getDistributorSid());
         for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
             BaseDistributorAppendix entity = new BaseDistributorAppendix();
             BeanUtil.copyProperties(baseDistributorAppendix, entity);
@@ -226,14 +231,14 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
             entity.setFilePath(filePath);
-            entity.setLinkSid(sid);
+            entity.setLinkSid(baseDistributorLegal.getDistributorSid());
             baseDistributorAppendixService.save(entity);
         }
-        baseDistributorBankService.delByDistributorSid(sid);
+        baseDistributorBankService.delByDistributorSid(baseDistributorLegal.getDistributorSid());
         for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
             BaseDistributorBank entity = new BaseDistributorBank();
             BeanUtil.copyProperties(baseDistributorBank, entity);
-            entity.setDistributorSid(sid);
+            entity.setDistributorSid(baseDistributorLegal.getDistributorSid());
             baseDistributorBankService.save(entity);
         }
         return rb.success().setMsg("修改成功");

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

@@ -60,7 +60,7 @@ public class BaseDistributorLegalService extends MybatisBaseService<BaseDistribu
         BaseDistributorLegalVo baseDistributorLegalVo = baseMapper.details(sid);
         List<BaseDistributorAppendixVo> baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid);
         List<BaseDistributorBankVo> baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid);
-        List<BaseDistributorStaffVo> baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(sid);
+        List<BaseDistributorStaffVo> baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(baseDistributorLegalVo.getSid());
         baseDistributorLegalVo.setBaseDistributorAppendixs(baseDistributorAppendixVos);
         baseDistributorLegalVo.setBaseDistributorBanks(baseDistributorBankVos);
         baseDistributorLegalVo.setList(baseDistributorStaffVos);

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

@@ -163,6 +163,7 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         baseDistributorDto.setDistributorName(dto.getDistributorName());
         baseDistributorDto.setAddress(dto.getAddress());
         baseDistributorDto.setDistributorType(dto.getDistributorType());
+        baseDistributorDto.setDistributorTypeValue(dto.getDistributorTypeValue());
         baseDistributorDto.setBusinessMobile(dto.getBusinessMobile());
         int count1 = baseDistributorService.updateBySid(baseDistributorDto.toMap(), baseDistributorPerson.getDistributorSid());
         int count = updateBySid(baseDistributorPersonOneDto.toMap(), sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java

@@ -59,6 +59,6 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
      */
     List<BaseDistributorStaff> selectBySid(String sid);
 
-    @Select("select * from base_distributor_staff where distributorSid = #{sid}")
+    @Select("select * from base_distributor_staff where distributorSid = #{sid} AND isDelete = 0")
     List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
 }

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

@@ -94,8 +94,8 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 	}
 
 	@Override
-	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid,String modelSid) {
-		return baseVehicleService.fetchVehicle(vehicleSid);
+		return baseVehicleService.fetchVehicle(vehicleSid,modelSid);
 	}
 
 	@Override

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

@@ -115,6 +115,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 		if (StringUtils.isNotBlank(query.getModelName())) {
 			qw.like("modelName", query.getModelName());
 		}
+		qw.eq("createBySid",query.getStaffSid());
+		qw.eq("useOrgSid",query.getUseOrgSid());
 		return qw;
 	}
 	
@@ -132,9 +134,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
 				Integer isDept = data1.getIsDept();
 				String psid = data1.getPsid();
-				if (isDept == 0 && !psid.equals(0)) {
+				if (isDept != null){
-					orgSidPath = s;
+					if (isDept == 0 && !psid.equals(0)) {
-					break;
+						orgSidPath = s;
+						break;
+					}
 				}
 			}
 		}
@@ -262,14 +266,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 		variables.put("businessSid", businessSid);
 		variables.put("orgSid", orgSid); //部门sid
 		if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
-			String proDefId = ProcDefEnum.SEALAPPLY.getProDefId();
 			ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), dto.getUserSid(), variables);
 			if (resultBean1.getSuccess() && resultBean1.getData() != null) {
 				Map<String, String> map = (Map<String, String>) resultBean1.getData();
 				//更新业务表中的流程状态
 				Map<String, Object> paramMap = new HashMap<>();
 				paramMap.put("sid", businessSid);
-				paramMap.put("procDefId", ProcDefEnum.SEALAPPLY.getProDefId());
+				paramMap.put("procDefId", ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
 				paramMap.put("nodeState", map.get("nodeState"));
 				paramMap.put("procInsId", map.get("procInsId"));
 				paramMap.put("taskDefKey", map.get("taskDefKey"));
@@ -461,4 +464,5 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 	public ResultBean flowRecord(String procInsId, String deployId) {
 		return  flowTaskFeign.businessFlowRecord(procInsId,deployId);
 	}
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1175,14 +1175,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return qw;
     }
 
-    public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+    public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid,String modelSid) {
         ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid);
+        QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid,modelSid);
         BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw);
         return rb.success().setData(baseVehicleVo);
     }
 
-    private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid) {
+    private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid,String modelSid) {
         QueryWrapper<BaseVehicleVo> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(vehicleSid)){
@@ -1191,7 +1191,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 qw.ne("sid",s);
             }
         }
-
+        qw.eq("modelSid",modelSid);
         qw.eq("vehicleState",0005);
         qw.eq("lockedState",03);
         return qw;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkTypeEnum.java

@@ -12,6 +12,7 @@ public enum SysFormLinkTypeEnum {
     CAR_SALE_CONTRACT("0002", "新车买卖合同审核"),
     ADVANCE_GINVOICEAPPLY("0003", "提前开票审批"),
     VEHICLE_APPLY("0004", "排产申请审批"),
+    BASE_OUTSOURCING_APPLICATION("0005", "外采申请审批"),
     ;
 
     /**