修改提交

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/WorkFlowBranchEnum.java

@@ -13,7 +13,7 @@ public enum WorkFlowBranchEnum {
 
     DAILY("日常检查", "company", "daily", "daily"),
     SPECIAL_C("专项检查", "company", "special", "special"),
-    SPECIAL_E("专项检查", "external", "special", "special"),
+    SPECIAL_E("专项检查", "external", "special-daily", "special"),
     SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -265,7 +265,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("checkMode", hiddenDangerDto.getDangerType());
         result.put("planId", plan.getId());
         result.put("planName", plan.getName());
-        result.put("pointId", point.getId());
+        result.put("pointId", point.getOriginalId());
         result.put("pointName", point.getName());
         result.put("bizId", hiddenDangerDto.getCheckInputId());
         result.put("bizName", hiddenDangerDto.getInputItemName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/CheckParamUtil.java

@@ -45,6 +45,8 @@ public class CheckParamUtil {
                     param.setPlanId(Long.parseLong(queryRequests.get(i).getValue().toString()));
                 } else if ("companyId".equals(name)) {
                     param.setCompanyId(Long.parseLong(queryRequests.get(i).getValue().toString()));
+                } else if ("pointId".equals(name)) {
+                    param.setPointId(Long.parseLong(queryRequests.get(i).getValue().toString()));
                 }
             }
         }

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1996,7 +1996,7 @@
             <if test="companyId != null">
                 AND pp.original_id = #{companyId}
             </if>
-            <if test="pointId != null">
+            <if test="pointId != null  and pointId != -1">
                 AND pp.id = #{pointId}
             </if>
 <!--            <if test="orgCode != null">-->
@@ -2029,7 +2029,7 @@
             <if test="companyId != null">
                 AND pp.original_id = #{companyId}
             </if>
-            <if test="pointId != null">
+            <if test="pointId != null and pointId != -1">
                 AND pp.id = #{pointId}
             </if>
 <!--            <if test="orgCode != null">-->