Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -104,7 +104,7 @@ public class SafetyCheckJobBusiness {
         qw.lambda().eq(CoreSafecheckPlan::getPlanCycle, planCycle);
         qw.lambda().eq(CoreSafecheckPlan::getIsDeleted, 0);
         qw.lambda().eq(CoreSafecheckPlan::getPlanStatus, 1);
-        List<CoreSafecheckPlan> plans = planMapper.selectList(qw);
+        List<CoreSafecheckPlan> plans = planMapper.selectByCycle((long) planCycle);
         List<PlanTaskBuildVo> tasks = new ArrayList<>();
         for (CoreSafecheckPlan plan : plans) {
             List<PlanTaskBuildVo> planTask = createPlanTask(plan);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/CoreSafecheckPlanMapper.java

@@ -21,7 +21,7 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
      * @return 常规安全检查计划
      */
     CoreSafecheckPlan selectCoreSafecheckPlanById(Long id);
-
+    List<CoreSafecheckPlan> selectByCycle(Long cycle);
     /**
      * 查询常规安全检查计划列表
      *

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -128,48 +128,47 @@
 
     <select id="selectCoreSafecheckPlanById" parameterType="Long"
             resultMap="CoreSafecheckPlanResult">
-        SELECT
-            cr.NAME AS rule_point_rule_name,
-            ri.NAME AS rule_point_item_name,
-            rp.NAME AS rule_point_point_name,
-            are.NAME AS rule_point_area_name,
-            are.id AS rule_point_area_id,
-               pp.point_scan as rule_point_point_scan,
-               pp.required as rule_point_required,
-            rp.business_type as rule_point_business_type,
-            rp.id AS rule_point_id,
-            rp.rule_id AS rule_point_rule_id,
-            rp.item_id AS rule_point_item_id,
-            rp.area_id AS rule_point_area_id,
+        SELECT cr.NAME          AS rule_point_rule_name,
+               ri.NAME          AS rule_point_item_name,
+               rp.NAME          AS rule_point_point_name,
+               are.NAME         AS rule_point_area_name,
+               are.id           AS rule_point_area_id,
+               pp.point_scan    as rule_point_point_scan,
+               pp.required      as rule_point_required,
+               rp.business_type as rule_point_business_type,
+               rp.id            AS rule_point_id,
+               rp.rule_id       AS rule_point_rule_id,
+               rp.item_id       AS rule_point_item_id,
+               rp.area_id       AS rule_point_area_id,
 
-            c.*,
-            o1.NAME AS plan_create_org_name,
-            o2.NAME AS plan_of_org_name,
-            r.role_name,
-            r.id AS role_id,
-            eo.plan_id AS exec_org_plan_id,
-            eo.org_id AS exec_org_org_id,
-            co.plan_id AS check_org_plan_id,
-            co.org_id AS check_org_org_id,
-            o3.id AS exec_org_id,
-            o3.NAME AS exec_org_name,
-            o4.id AS check_org_id,
-            o4.NAME AS check_org_name
-        FROM
-            core_safecheck_plan c
-                LEFT JOIN sys_org o1 ON c.plan_create_org_id = o1.id
-                LEFT JOIN sys_org o2 ON c.plan_of_org_id = o2.id
-                LEFT JOIN core_safecheck_plan_to_role pr ON c.id = pr.plan_id
-                LEFT JOIN sys_role r ON r.id = pr.role_id
-                LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
-                LEFT JOIN sys_org o3 ON eo.org_id = o3.id
-                LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id
-                LEFT JOIN sys_org o4 ON co.org_id = o4.id
-                LEFT JOIN core_safecheck_plan_to_point pp ON pp.plan_id = c.id
-                LEFT JOIN core_safetycheck_rule_point rp ON rp.id = pp.point_id
-                LEFT JOIN core_safetycheck_rule_item ri ON ri.id = rp.item_id
-                LEFT JOIN core_safetycheck_rule cr ON cr.id = ri.rule_id
-                LEFT JOIN sys_area are ON are.id = rp.area_id
+               c.*,
+               o1.NAME          AS plan_create_org_name,
+               o2.NAME          AS plan_of_org_name,
+               r.role_name,
+               r.id             AS role_id,
+               eo.plan_id       AS exec_org_plan_id,
+               eo.org_id        AS exec_org_org_id,
+               co.plan_id       AS check_org_plan_id,
+               co.org_id        AS check_org_org_id,
+               o3.id            AS exec_org_id,
+               o3.NAME          AS exec_org_name,
+               o4.id            AS check_org_id,
+               o4.NAME          AS check_org_name
+        FROM core_safecheck_plan c
+                 LEFT JOIN sys_org o1 ON c.plan_create_org_id = o1.id
+                 LEFT JOIN sys_org o2 ON c.plan_of_org_id = o2.id
+                 LEFT JOIN core_safecheck_plan_to_role pr ON c.id = pr.plan_id
+                 LEFT JOIN sys_role r ON r.id = pr.role_id
+                 LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
+                 LEFT JOIN sys_org o3 ON eo.org_id = o3.id
+                 LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id
+                 LEFT JOIN sys_org o4 ON co.org_id = o4.id
+                 LEFT JOIN core_safecheck_plan_to_point pp ON pp.plan_id = c.id
+                 LEFT JOIN core_safetycheck_rule_point rp ON rp.id = pp.point_id
+                 LEFT JOIN core_safetycheck_rule_item ri ON ri.id = rp.item_id
+                 LEFT JOIN core_safetycheck_rule cr ON cr.id = ri.rule_id
+                 LEFT JOIN sys_area are
+        ON are.id = rp.area_id
         where c.id = #{id}
 
     </select>
@@ -247,6 +246,30 @@
         from core_safecheck_plan_to_point
         where plan_id = #{planId}
     </select>
+    <select id="selectByCycle" resultType="com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan">
+        SELECT
+        p.*
+        FROM
+        core_safecheck_plan p
+        LEFT JOIN sys_org o1 ON o1.id = p.plan_of_org_id
+        LEFT JOIN core_safecheck_plan_to_exec_org pe ON pe.plan_id = p.id
+        LEFT JOIN sys_org o2 ON o2.id = pe.org_id
+        WHERE
+        1 = 1
+        AND p.is_deleted = 0
+        AND p.plan_status = 1
+        <if test="cycle != null and cycle!=''">
+            and p.plan_cycle=#{cycle}
+        </if>
+        and ( o1.type = 3
+        OR o2.type IN (
+        1,
+        2
+        )
+            )
+
+
+    </select>
 
     <insert id="insertCoreSafecheckPlan" parameterType="com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan"
             useGeneratedKeys="true" keyProperty="id">