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

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
 import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
+import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +16,17 @@ import java.util.List;
 @Data
 public class BaseDistributorLegalVo implements Vo {
 
+    @ApiModelProperty("经销商sid（陕汽必须字段）")
+    private String distributorSid;
+
+    @ApiModelProperty("userSid")
+    private String userSid;
+   //@ApiModelProperty(value = "使用组织sid:List类型")
+    //private String[][] useOrg;
+
+    @ApiModelProperty(value = "使用组织sid类型")
+    private String useOrg;
+
     @ApiModelProperty(value = "经销商名称")
     private String distributorName;
 
@@ -36,11 +48,12 @@ public class BaseDistributorLegalVo implements Vo {
     @ApiModelProperty(value = "联系电话")
     private String businessMobile;
 
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
     @ApiModelProperty(value = "通讯地址邮编")
     private String zipCode;
 
-    @ApiModelProperty(value = "使用组织")
-    private String useOrg;
     @ApiModelProperty(value = "使用组织Name")
     private String useOrgName;
 
@@ -101,7 +114,7 @@ public class BaseDistributorLegalVo implements Vo {
     private String remarks;
 
     @ApiModelProperty("人员list")
-    private List<BaseDistributorStaffDto> list;
+    private List<BaseDistributorStaffVo> list;
     @ApiModelProperty(value = "备案资料")
     private List<BaseDistributorAppendixVo> baseDistributorAppendixs;
     @ApiModelProperty(value = "备案账号")

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

@@ -14,6 +14,8 @@ public class BaseDistributorPersonVo implements Vo {
 	@ApiModelProperty("经销商sid（陕汽必须字段）")
     private String distributorSid;
 
+    @ApiModelProperty("userSid")
+    private String userSid;
     //以下为基础表的字段
     @ApiModelProperty(value = "姓名")
     private String distributorName;

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

@@ -55,4 +55,8 @@ public class BaseOutsourcingApplicationQuery implements Query {
 	private String applicationEndDate; // 申请日期结束日期
 	@ApiModelProperty("车型名称")
     private String modelName; // 车型名称
+	@ApiModelProperty("业务员sid")
+	private String staffSid; // 业务员sid
+	@ApiModelProperty("分公司sid")
+	private String useOrgSid; // 分公司sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java

@@ -14,8 +14,8 @@ import java.util.Map;
 
 @Api(tags = "Flowable")
 @FeignClient(
-        contextId = "anrui-buscenter-flow-Flowable",
-        name = "anrui-buscenter",
+        contextId = "anrui-base-flow-Flowable",
+        name = "anrui-base",
         path = "v1/flow",
         fallback = FlowableFallback.class)
 public interface FlowableFeign {

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

@@ -120,7 +120,6 @@ public class BaseDistributorRest implements BaseDistributorFeign {
      */
     @Override
     public ResultBean<Map<String, Object>> details(String sid) {
-        BaseDistributorPersonVo baseDistributorPersonVo = new BaseDistributorPersonVo();
         ResultBean rb = ResultBean.fireFail();
 //        BaseDistributor baseDistributor = baseDistributorService.fetchBySid(sid);
         BaseDistributorVo baseDistributorVo = baseDistributorService.selBySid(sid);
@@ -128,13 +127,14 @@ public class BaseDistributorRest implements BaseDistributorFeign {
             return rb.fail().setMsg("该经销商不存在");
         } else {
             if (personType.equals(baseDistributorVo.getDistributorClassification())) {//个人
-                baseDistributorPersonVo = baseDistributorPersonService.details(sid);
+                BaseDistributorPersonVo baseDistributorPersonVo = baseDistributorPersonService.details(sid);
+                return rb.success().setData(baseDistributorPersonVo);
             } else if (legalType.equals(baseDistributorVo.getDistributorClassification())) {//法人
-                BaseDistributorLegalVo details = baseDistributorLegalService.details(sid);
-                //map.put("useOrg",baseDistributorVo.getUseOrg());
+                BaseDistributorLegalVo baseDistributorLegalVo = baseDistributorLegalService.details(sid);
+                return rb.success().setData(baseDistributorLegalVo);
             }
         }
-        return rb.success().setData(baseDistributorPersonVo);
+        return rb.success();
     }
 
     /**

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.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型
         baseDistributor.setDistributorTypeValue(dto.getDistributorTypeValue());//经销商类型value
@@ -138,6 +139,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
      */
     public ResultBean<String> saveGrDto(BaseDistributorPersonDto dto) {
         BaseDistributor baseDistributor = new BaseDistributor();
+        baseDistributor.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型
         baseDistributor.setDistributorTypeValue(dto.getDistributorTypeValue());//经销商类型value值

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

@@ -5,6 +5,7 @@
     <!--根据经销商sid查询经销商法人及经销商基础信息-->
     <select id="details" resultType="com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo">
         SELECT bl.sid,
+               bd.createBySid as userSid,
                bl.enterpriseContact,
                bl.enterpriseNature,
                bl.registeredCapital,

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

@@ -91,6 +91,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
             String sid = stringResultBean.getData();//经销商sid
             //存储法人表信息
             bdbl.setDistributorSid(sid);
+            bdbl.setCreateBySid(dto.getUserSid());
             bdbl.setEnterpriseNature(dto.getEnterpriseNature());
             bdbl.setRegisteredCapital(dto.getRegisteredCapital());
             bdbl.setRegisteredCapitalOrg(dto.getRegisteredCapitalOrg());
@@ -135,10 +136,8 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
             entity.setFilePath(filePath);
             entity.setLinkSid(jxsSid);
             boolean save = baseDistributorAppendixService.save(entity);
-            if (save) {
-                return rb.success().setMsg("保存成功");
-            } else {
-                return rb.setMsg("保存失败");
+            if (!save) {
+                return rb.setMsg("备案资料保存失败");
             }
         }
         for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
@@ -146,10 +145,8 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
             BeanUtil.copyProperties(baseDistributorBank, entity);
             entity.setDistributorSid(jxsSid);
             boolean save = baseDistributorBankService.save(entity);
-            if (save) {
-                return rb.success().setMsg("保存成功");
-            } else {
-                return rb.setMsg("保存失败");
+            if (!save) {
+                return rb.setMsg("备案账号保存失败");
             }
         }
         return rb.success().setData(stringResultBean.getData()).setMsg("保存成功");

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

@@ -1,11 +1,18 @@
 package com.yxt.anrui.base.biz.basedistributorlegal;
 
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
+import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
+import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
+import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService;
+import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,7 +33,12 @@ public class BaseDistributorLegalService extends MybatisBaseService<BaseDistribu
 
     @Autowired
     BaseDistributorLegalMapper baseDistributorLegalMapper;
-
+    @Autowired
+    private BaseDistributorAppendixService baseDistributorAppendixService;
+    @Autowired
+    private BaseDistributorBankService baseDistributorBankService;
+    @Autowired
+    private BaseDistributorStaffService baseDistributorStaffService;
 
     /**
      * 根据经销商sid删除经销商法人信息
@@ -45,6 +57,13 @@ public class BaseDistributorLegalService extends MybatisBaseService<BaseDistribu
      * @return
      */
     public BaseDistributorLegalVo details(String sid) {
-        return baseMapper.details(sid);
+        BaseDistributorLegalVo baseDistributorLegalVo = baseMapper.details(sid);
+        List<BaseDistributorAppendixVo> baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid);
+        List<BaseDistributorBankVo> baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid);
+        List<BaseDistributorStaffVo> baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(sid);
+        baseDistributorLegalVo.setBaseDistributorAppendixs(baseDistributorAppendixVos);
+        baseDistributorLegalVo.setBaseDistributorBanks(baseDistributorBankVos);
+        baseDistributorLegalVo.setList(baseDistributorStaffVos);
+        return baseDistributorLegalVo;
     }
 }

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

@@ -10,7 +10,7 @@
     <!--根据经销商sid查询经销商个人及经销商基础信息-->
     <select id="details" resultType="com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo">
         SELECT bp.sid,
-               bp.distributorSid,
+               bp.createBySid as userSid,
                bp.projectType,
                bp.projectTypeValue,
                bp.distributorBrand,

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

@@ -99,9 +99,11 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         }
         //创建基础信息的对象,和数据库对应的实体类
         ResultBean<String> stringResultBean = baseDistributorService.saveGrDto(dto);
+        String sid = stringResultBean.getData();
         if (stringResultBean.getSuccess()) {
-            String sid = stringResultBean.getData();
+
             //存储个人表信息
+            bp.setCreateBySid(dto.getUserSid());
             bp.setDistributorSid(sid);//经销商sid
             bp.setProjectType(dto.getProjectType());//项目类型
             bp.setProjectTypeValue(dto.getProjectTypeValue());//项目类型Value
@@ -114,7 +116,6 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
             bp.setRemarks(dto.getRemarks());
             save(bp);
         }
-        String sid = bp.getSid();
         for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
             BaseDistributorAppendix entity = new BaseDistributorAppendix();
             BeanUtil.copyProperties(baseDistributorAppendix, entity);

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

@@ -58,4 +58,7 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
      * @return
      */
     List<BaseDistributorStaff> selectBySid(String sid);
+
+    @Select("select * from base_distributor_staff where distributorSid = #{sid}")
+    List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
 }

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

@@ -74,4 +74,8 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
     public List<BaseDistributorStaff> selectBySid(String sid) {
         return baseMapper.selectBySid(sid);
     }
+
+    public List<BaseDistributorStaffVo> selbyDistributorSid(String sid) {
+        return baseMapper.selbyDistributorSid(sid);
+    }
 }

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

@@ -120,15 +120,28 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 	
 	public PagerVo<BaseOutsourcingApplicationVo> listPageVo(PagerQuery<BaseOutsourcingApplicationQuery> pq) {
 		BaseOutsourcingApplicationQuery query = pq.getParams();
+		String staffSid = query.getStaffSid();
+		ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
+		List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
+		String orgSidPath = "";
+		for (SysStaffOrgVo datum : data) {
+			orgSidPath = datum.getOrgSidPath();
+			String[] split = orgSidPath.split("/");
+			for (String s : split) {
+				ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
+				SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
+				Integer isDept = data1.getIsDept();
+				String psid = data1.getPsid();
+				if (isDept == 0 && !psid.equals(0)) {
+					orgSidPath = s;
+					break;
+				}
+			}
+		}
+		query.setUseOrgSid(orgSidPath);
 		QueryWrapper<BaseOutsourcingApplication> qw = createQueryWrapper(query);
 		IPage<BaseOutsourcingApplication> page = PagerUtil.queryToPage(pq);
 		IPage<BaseOutsourcingApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
-		List<BaseOutsourcingApplicationVo> records = pagging.getRecords();
-		for (BaseOutsourcingApplicationVo record : records) {
-			String sid = record.getSid();
-			String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState();
-			record.setNodeState(nodeState);
-		}
 		PagerVo<BaseOutsourcingApplicationVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}