Browse Source

copyScene -mq

lyhzzz 1 năm trước cách đây
mục cha
commit
620f37f9c2

+ 7 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -100,6 +100,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IUserService userService;
     @Autowired
     ISceneMoveLogService sceneMoveLogService;
+    @Autowired
+    IProjectNumService projectNumService;
 
     @Override
     public Long getCountByUserIds(List<Long> userIds) {
@@ -145,6 +147,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
              numList = tmContractorNumService.getNumListByCompanyId(user.getCompanyId());
              param.setCooperateSceneCodes(numList);
         }
+        if(param.getProjectId() != null){
+            List<ProjectNum> projectNumList = projectNumService.getByProjectId(Arrays.asList(param.getProjectId()));
+            List<String> projectNums = projectNumList.stream().map(ProjectNum::getNum).collect(Collectors.toList());
+            param.setProjectNums(projectNums);
+        }
 
         Page<SceneVo> page  = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -32,4 +32,6 @@ public class SceneParam extends RequestBase {
     private Boolean isMigrate = true;
 
     private Integer id;
+    private Integer projectId;
+    private List<String> projectNums;
 }

+ 8 - 0
src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -72,6 +72,14 @@
         <if test="param.userId !=null and param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size ==0 ">
             and (co.id = #{param.companyId} or s.user_id = #{param.userId} )
         </if>
+
+        <if test="param.projectNums !=null and param.projectNums.size >0">
+            and  s.num in
+            <foreach collection="param.projectNums" item="num" open="(" separator="," close=")">
+                #{num}
+            </foreach>
+            )
+        </if>
     </sql>
 
 </mapper>