lyhzzz 1 year ago
parent
commit
0dde843fad

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/httpClient/param/LaserSceneParam.java

@@ -19,4 +19,5 @@ public class LaserSceneParam {
     private String endTime;
     private List<String> cooperateSceneCodes;
     private Integer status;
+    private Integer neStatus;
 }

+ 3 - 0
src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -155,6 +155,9 @@ public class LaserService {
             }
         }
         BeanUtils.copyProperties(param,newParam);
+        if(newParam.getNeStatus()!=null){
+            newParam.setNeStatus(newParam.getNeStatus() == -2 ?3 : newParam.getNeStatus());
+        }
         newParam.setTitle(param.getSceneName());
         return newParam;
     }

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

@@ -112,6 +112,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!roleIds.contains(6L)){
                 //param.setUserId(user.getId());
                 param.setIsDel(false);
+                param.setNeStatus(-2);   //公司员工看不到封档的场景
             }
         }
         List<String> numList = tmContractorNumService.getNumListByCompanyId(user.getCompanyId());

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

@@ -25,5 +25,6 @@ public class SceneParam extends RequestBase {
     private List<String> numList;
     private List<String> cooperateSceneCodes;
     private Integer status;
+    private Integer neStatus;
     private Boolean isDel = true;
 }

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

@@ -66,6 +66,9 @@
         <if test="param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size ==0 ">
             and co.id = #{param.companyId}
         </if>
+        <if test="param.neStatus !=null ">
+            and s.pay_status != #{param.neStatus}
+        </if>
     </sql>
 
 </mapper>