From 4730d6fe7851f87905cbd096be17b03df8844ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 16 Jun 2023 16:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicCorpController.java    | 8 +++++++-
 .../com/glxp/api/dao/inout/UnitMaintainPlatformDao.java   | 2 +-
 .../api/req/basic/BasicUnitMaintainFilterRequest.java     | 1 +
 .../glxp/api/service/inout/impl/PlatformServiceImpl.java  | 7 +++++--
 src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml  | 6 ++++++
 .../mybatis/mapper/inout/UnitMaintainPlatformDao.xml      | 3 ++-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
index c9362f972..75b1f4c60 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
@@ -78,7 +78,13 @@ public class BasicCorpController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicCorpEntity> basicUnitMaintainEntities;
-        basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
+        //是供应商的时候拉客户和供应商
+        if(basicUnitMaintainFilterRequest.getCorpType() == 2){
+            basicUnitMaintainFilterRequest.setCorpType(null);
+            basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
+        }else{
+            basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
+        }
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java
index f70ad117b..6eeedbd85 100644
--- a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java
@@ -44,5 +44,5 @@ public interface UnitMaintainPlatformDao {
 
     List<PlatformLinkResponse> selectDelectList(@Param("platformId") String platformId);
 
-    PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld);
+    PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld,@Param("sourceAction") String sourceAction);
 }
\ No newline at end of file
diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
index 679c72612..5988d335f 100644
--- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
@@ -26,5 +26,6 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
     private Integer outType;
     private Boolean isDownThrSys;
     private String lastUpdateTime;
+    private List<Integer> corpTypeList;
     List<BasicErpUnitsResponse>thrCorpEntities;
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java
index 4deeda1a7..8a91ab2ad 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java
@@ -318,7 +318,7 @@ public class PlatformServiceImpl implements PlatformService {
             return ResultVOUtils.error(999, "该单据不存在!");
         }
         //查询客户关联信息
-        PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp());
+        PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp(),ioOrderEntity.getAction());
         if(platformLinkRespons == null){
             return ResultVOUtils.error(999, "该单没有设置补单条件!");
         }
@@ -353,7 +353,10 @@ public class PlatformServiceImpl implements PlatformService {
                 ioOrderInvoiceEntity.setLicenseUrl("as" + ioOrderInvoiceEntity.getLicenseUrl());
             }
         }
-        relayFile(list,platformLinkRespons.getHost());
+        //没有图片的时候不用上传
+        if(list.size()>0){
+            relayFile(list,platformLinkRespons.getHost());
+        }
 
         //组装数据
         String host = platformLinkRespons.getHost();
diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
index 83ac4e605..37dd870b1 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
@@ -30,6 +30,12 @@
             <if test="corpType != null">
                 AND corpType = #{corpType}
             </if>
+            <if test="corpTypeList !=null and corpTypeList.size()>0">
+                AND corpType in
+                <foreach item="item" index="index" collection="corpTypeList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="outType != null">
                 AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
             </if>
diff --git a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml
index cf1c52b7e..1d99ece2a 100644
--- a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml
@@ -183,6 +183,7 @@
         a1.host
         FROM io_unit_maintain_platform io
         inner join auth_platform a1 on a1.id = io.platformId
-        where io.unitId = #{unitld}
+        where io.unitId = #{unitld} and  io.sourceAction = #{sourceAction}
+        GROUP BY 	io.unitId
     </select>
 </mapper>
\ No newline at end of file