lyhzzz 1 рік тому
батько
коміт
0404c3daad

+ 7 - 1
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -66,6 +66,8 @@ public class AppSceneService {
     ITmContractorNumService tmContractorNumService;
     @Autowired
     LaserService laserService;
+    @Autowired
+    ISceneCopyLogService sceneCopyLogService;
 
     @Value("${fyun.host}")
     private String ossHost;
@@ -109,7 +111,11 @@ public class AppSceneService {
                 }
             }
         }
-        log.info("sqlparam:{}",param);
+        List<SceneCopyLog> list = sceneCopyLogService.list();
+        if(!list.isEmpty()){
+            List<String> copyNumList = list.stream().map(SceneCopyLog::getNewNum).collect(Collectors.toList());
+            param.setCopyNumList(copyNumList);
+        }
         Page<AppSceneVo> page =  scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<String> numList = page.getRecords().stream().map(AppSceneVo::getNum).collect(Collectors.toList());
 

+ 3 - 0
src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -40,4 +40,7 @@ public class AppSceneParam extends RequestBase {
     private List<String> snCodes;
     private Integer payStatus;
 
+    private List<String> copyNumList = new ArrayList<>();
+
+
 }

+ 6 - 0
src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -49,6 +49,12 @@
         <if test= "param.payStatus != null">
             and p.pay_status = #{param.payStatus}
         </if>
+        <if test= "param.copyNumList != null and param.copyNumList.size >0">
+            and p.num not in
+            <foreach collection="param.copyNumList" item="num" open="(" separator="," close=")">
+                #{num}
+            </foreach>
+        </if>
 
         <if test="param.userId !=null and param.companyId !=null and param.cooperationNumList !=null and param.cooperationNumList.size >0">
             and ( p.user_id = #{param.userId} or co.id = #{param.companyId} or p.num in