Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -124,6 +124,10 @@ import static com.alibaba.fastjson.JSON.toJSONString;
 @EnableAsync
 @Slf4j
 public class PlanTaskServiceImpl implements IPlanTaskService {
+    /**
+     * 企业自查标识
+     */
+    public static final String ENTERPRISE_SELF_INSPECTION_FLAG = "enterpriseSelfInspectionFlag";
     @Resource
     private DataSource dataSource;
 
@@ -2037,7 +2041,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     public Page<Map<String, Object>> getPlanTasks(String toke, String product, String appKey, HashMap<String, Object> params) {
         CommonPageable pageParam = new CommonPageable();
         List<Map<String, Object>> content = Lists.newArrayList();
-        if (params.containsKey("finishStatus")) {
+        if (!ValidationUtil.isEmpty(params.get("finishStatus"))) {
             params.put("finishStatus", String.valueOf(PlanTaskTheStatusEnum.getValue(params.get("finishStatus").toString())));
         }
 
@@ -2076,6 +2080,19 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             query.must(QueryBuilders.rangeQuery("endTime").lte(params.get("endTime")));
             boolMust.must(query);
         }
+        // 企业自查  =》 taskName === '企业自查' && "type" === "monthlyScheduling",
+        if (!ObjectUtils.isEmpty(params.get(ENTERPRISE_SELF_INSPECTION_FLAG)) && "true".equals(Objects.toString(params.get(ENTERPRISE_SELF_INSPECTION_FLAG)))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.matchPhraseQuery("type", "*" + PlanTaskTypeStatusEnum.month.getName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("taskName", "*" + "企业自查" + "*"));
+            boolMust.must(query);
+        } else if (!ObjectUtils.isEmpty(params.get(ENTERPRISE_SELF_INSPECTION_FLAG)) && "false".equals(Objects.toString(params.get(ENTERPRISE_SELF_INSPECTION_FLAG)))) {
+            // 不是企业自查 排除掉月计划中名称为企业自查的数据项
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.matchPhraseQuery("type", "*" + PlanTaskTypeStatusEnum.month.getName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("taskName", "*" + "企业自查" + "*"));
+            boolMust.mustNot(query);
+        }
 
         builder.query(boolMust);
         if (!ValidationUtil.isEmpty(params.get("orderBy"))) {