From 836007cf65167014c1b956c1d0885e77ba5defe2 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, 7 Apr 2023 15:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemPDFTemplateRelevanceCodeController.java |  9 ++++++++-
 .../glxp/api/dao/basic/BasicBussinessTypeDao.java |  2 ++
 .../service/basic/IBasicBussinessTypeService.java |  2 ++
 .../basic/impl/BasicBussinessTypeServiceImpl.java |  4 ++++
 .../SystemPDFTemplateRelevanceCodeService.java    |  2 ++
 ...SystemPDFTemplateRelevanceCodeServiceImpl.java |  5 +++++
 .../mapper/basic/BasicBussinessTypeDao.xml        | 15 +++++++++++++++
 7 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java
index b9be0ac7..1fa2e01f 100644
--- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java
+++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -34,9 +35,15 @@ public class SystemPDFTemplateRelevanceCodeController {
     @PostMapping("/system/pdf/templateRelevanceCode/getListByModelId")
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
+        List<String> ids=new ArrayList<>();
         FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
         filterBussinessTypeRequest.setEnable(true);
-        List<BasicBussinessTypeEntity> bussinessLocalTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest);
+        List<SysPdfTemplateRelevanceCodeEntity> list=systemPDFTemplateRelevanceCodeService.selectList();
+        for (SysPdfTemplateRelevanceCodeEntity obj:list){
+            ids.add(obj.getLocalAction());
+        }
+
+        List<BasicBussinessTypeEntity> bussinessLocalTypeEntities = basicBussinessTypeService.selectbyNotAction(ids);
         for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) {
             SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity = new SysPdfTemplateRelevanceCodeEntity();
             systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction());
diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
index 7e212f9f..f4512f5d 100644
--- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
@@ -72,4 +72,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
      * @return
      */
     String selectNameByAction(@Param("action") String action);
+
+    List<BasicBussinessTypeEntity> selectbyNotAction(@Param("list") List<String> list);
 }
diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java
index 47b8b221..c3f4f048 100644
--- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java
+++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java
@@ -116,4 +116,6 @@ public interface IBasicBussinessTypeService {
 
 
     List<BasicBussinessTypeEntity> findByVueType(String vueType);
+
+    List<BasicBussinessTypeEntity> selectbyNotAction(List<String> list);
 }
diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
index e61da7c5..5d3719fc 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
@@ -282,4 +282,8 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         bussinessTypeEntity.setUpdateTime(now);
     }
 
+    @Override
+    public List<BasicBussinessTypeEntity> selectbyNotAction(List<String> list) {
+        return basicBussinessTypeDao.selectbyNotAction(list);
+    }
 }
diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java
index d162b663..64a0f4d1 100644
--- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java
+++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java
@@ -15,6 +15,8 @@ public interface SystemPDFTemplateRelevanceCodeService {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
 
+    List<SysPdfTemplateRelevanceCodeEntity> selectList();
+
     boolean udpateRl(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
 
     boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java
index 4d62150b..f18d30a8 100644
--- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java
@@ -39,6 +39,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl
         return sysPdfTemplateRelevanceCodeDao.filterList(systemPDFModuleRequest);
     }
 
+    @Override
+    public List<SysPdfTemplateRelevanceCodeEntity> selectList() {
+        return sysPdfTemplateRelevanceCodeDao.selectList(new QueryWrapper<>());
+    }
+
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) {
 
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index 77288f09..314666c2 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -304,4 +304,19 @@
         from basic_bussiness_type
         where action = #{action}
     </select>
+
+    <select id="selectbyNotAction" parameterType="list"
+            resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
+        select *
+        from basic_bussiness_type
+        <where>
+            <if test="list != null and list.size()!=0">
+                and action not in
+                <foreach collection="list" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>