修改获取分公司供应商

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -131,4 +131,8 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
 
     BaseManufacturerSidVo getManufacturerSidAndSupplierSid(@Param("manBankSid") String manBankSid, @Param("useOrgSid") String useOrgSid);
+
+    List<BaseManufacturer> selectByMank(@Param("mankSid") String s, @Param("type") String type, @Param("orgSid") String orgSid);
+
+    int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -19,7 +19,7 @@
         bm.createOrgName,
         bm.manufacturerCode
         FROM base_manufacturer bm
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
     <!--根据厂商名称查重-->
     <select id="selectCountByName" resultType="int">
@@ -111,13 +111,13 @@
         <!--联系人姓名-->
         bm.contactName
         FROM base_manufacturer bm
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
     <!--根据使用组织查询厂商下拉框数据-->
     <select id="selectByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufactureSelectVo">
         SELECT bm.manufacturerName, bm.sid
         FROM base_manufacturer bm
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectAppListByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAppSearchVo">
@@ -183,14 +183,14 @@
 
     <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
         select bmb.sid,
-               bmb.actualPay as name ,
+               bmb.actualPay as name,
                bmb.actualPay,
                bmb.depositBank,
                bmb.bankAccount,
-               bmb.sid actualPaySid
+               bmb.sid          actualPaySid
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
-                     left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
         where bvb.sid = #{carBrandSid}
           and bmb.dueBankValue = '回款账户'
           and bmb.isDelete = 0
@@ -205,26 +205,22 @@
     </select>
 
     <select id="selectOrgList" resultType="java.lang.String">
-        select useOrg
+        select manBankSid
         from base_manufacturer
         where supplierTypeValue = #{type}
     </select>
 
     <select id="getManufacturerSidAndSupplierSid"
             resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo">
-        SELECT
+        SELECT bm.sid as supplierSid
-            bm.sid as supplierSid
+        FROM base_manufacturer bm
-        FROM
+        WHERE bm.useOrg = #{useOrgSid}
-            base_manufacturer bm
-        WHERE
-            bm.useOrg = #{useOrgSid}
           and bm.manBankSid = #{manBankSid}
           AND bm.isDelete = 0
     </select>
 
     <select id="saveGysByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo">
-        SELECT
+        SELECT bm.sid,
-        bm.sid,
         <!--厂商名称-->
         bm.manufacturerName,
         <!--简称-->
@@ -274,7 +270,7 @@
         bm.county,
         bm.manBankSid
         FROM base_manufacturer bm
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectByOrgSidAndManBankSid"
@@ -285,4 +281,20 @@
           AND manBankSid = #{manBankSid}
           AND isDelete = 0
     </select>
+
+    <select id="selectByMank" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
+        select *
+        from base_manufacturer
+        where createOrg = #{orgSid}
+          and manBankSid = #{mankSid}
+          and supplyTypeValue = #{type}
+    </select>
+
+    <update id="updateMank">
+        update base_manufacturer
+        set createOrgName    = #{createName},
+            useOrgName       = #{createName},
+            manufacturerName = #{name}
+        where sid = #{sid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -464,7 +464,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         ResultBean<BaseManufacturerSidVo> rb = ResultBean.fireFail();
         BaseManufacturerSidVo vo = null;
         String manBankSid = baseVehicleBrandService.selectByManufacturerSid(carBrandSid);
-        if (StringUtils.isNotBlank(manBankSid)){
+        if (StringUtils.isNotBlank(manBankSid)) {
             vo = baseMapper.getManufacturerSidAndSupplierSid(manBankSid, useOrgSid);
             vo.setManufacturerSid(manBankSid);
         }
@@ -533,11 +533,43 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 stringList.add(ss);
             }
         }
+        ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid);
+        SysOrganizationVo vo = organizationVoResultBean.getData();
         //去重
         stringList = stringList.stream().distinct().collect(Collectors.toList());
-        //查询类别为分公司的
+        for (String s : stringList) {
-        String type = "分公司";
+            if(orgSid.equals(s)){
-        List<String> orgList2 = selectOrgList(type);
+                continue;
+            }
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(s);
+            SysOrganizationVo sysOrganizationVo = resultBean.getData();
+            //查询类别为分公司的
+            String type = "分公司";
+            //查询是否有该分公司的
+            List<BaseManufacturer> list = baseMapper.selectByMank(s, type, orgSid);
+            list.removeAll(Collections.singleton(null));
+            if (!list.isEmpty()) {
+                BaseManufacturer baseManufacturer = list.get(0);
+                //修改
+                baseMapper.updateMank(baseManufacturer.getSid(),sysOrganizationVo.getName(),vo.getName());
+            } else {
+                if (sysOrganizationVo != null) {
+                    BaseManufacturer baseManufacturer = new BaseManufacturer();
+                    baseManufacturer.setSupplierType("0005");
+                    baseManufacturer.setSupplierTypeValue("分公司");
+                    baseManufacturer.setManufacturerName(sysOrganizationVo.getName());
+                    baseManufacturer.setCreateOrg(orgSid);
+                    if(vo != null){
+                        baseManufacturer.setCreateOrgName(vo.getName());
+                        baseManufacturer.setUseOrgName(vo.getName());
+                    }
+                    baseManufacturer.setUseOrg(orgSid);
+                    baseManufacturer.setManBankSid(s);
+                    insert(baseManufacturer);
+                }
+            }
+        }
+        /*List<String> orgList2 = selectOrgList(type);
         orgList2.add(orgSid);
         HashSet h1 = new HashSet(stringList);
         HashSet h2 = new HashSet(orgList2);
@@ -560,7 +592,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 baseManufacturer.setUseOrgName(sysOrganizationVo.getName());
                 insert(baseManufacturer);
             }
-        }
+        }*/
         return rb.success();
     }
 
@@ -574,11 +606,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         for (BaseManufacturerDetailsVo baseManufacturerDetailsVo : baseManufacturerDetailsVos) {
             String manBankSid = baseManufacturerDetailsVo.getSid();
             BaseManufacturerDetailsVo baseManufacturerDetailsVo1 = baseMapper.selectByOrgSidAndManBankSid(orgSid, manBankSid);
-            if (baseManufacturerDetailsVo1 != null){
+            if (baseManufacturerDetailsVo1 != null) {
                 BaseManufacturerDto baseManufacturerDto = new BaseManufacturerDto();
                 BeanUtil.copyProperties(baseManufacturerDetailsVo, baseManufacturerDto, "sid", "manufacturerCode");
-                updateBySid(baseManufacturerDto,baseManufacturerDetailsVo1.getSid());
+                updateBySid(baseManufacturerDto, baseManufacturerDetailsVo1.getSid());
-            }else {
+            } else {
                 BaseManufacturer baseManufacturer = new BaseManufacturer();
                 BeanUtil.copyProperties(baseManufacturerDetailsVo, baseManufacturer, "sid", "manufacturerCode");
                 baseManufacturer.setManBankSid(baseManufacturerDetailsVo.getSid());
@@ -592,7 +624,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
 
     public ResultBean<String> selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.selectByOrgSidAndManBankSid(useOrgSid,manufacturerSid);
+        BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid);
         return rb.success().setData(baseManufacturerDetailsVo.getSid());
     }
 }