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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -49,7 +49,12 @@ public class CoreSafecheckPlanController extends BaseController {
         return coreSafecheckPlanService.selectPage(coreSafecheckPlan);
     }
 
-
+    @ApiOperation(value = "获取详情")
+    @GetMapping(value = "/getPointIds/{id}")
+//    @RequiresPermissions("core:plan:findById")
+    public AjaxResult getPointIds(@PathVariable Long id) {
+        return AjaxResult.success(coreSafecheckPlanService.selectItemIdsByPlanId(id));
+    }
     /**
      * 获取常规安全检查计划详细信息
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -162,7 +162,7 @@ public class CoreSafecheckPlan extends BaseEntity {
      * 立即生成任务
      */
     @ApiModelProperty(value = "立即生成任务")
-    private String buildTaskNow;
+    private boolean buildTaskNow;
 
     /**
      * 备注
@@ -236,7 +236,7 @@ public class CoreSafecheckPlan extends BaseEntity {
                 .append("endDate", getEndDate())
 
 
-                .append("buildTaskNow", getBuildTaskNow())
+                .append("buildTaskNow",isBuildTaskNow())
 
 
                 .append("description", getDescription())

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlanToPoint.java

@@ -26,10 +26,11 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 public class CoreSafecheckPlanToPoint extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    public CoreSafecheckPlanToPoint(Long planId, Long pointId, boolean pointScan) {
+    public CoreSafecheckPlanToPoint(Long planId, Long pointId, boolean pointScan,boolean required) {
         this.planId = planId;
         this.pointId = pointId;
         this.pointScan = pointScan;
+        this.required=required;
     }
 
     /**
@@ -49,10 +50,13 @@ public class CoreSafecheckPlanToPoint extends BaseEntity {
      */
     @ApiModelProperty(value = "是否扫描NFC 1扫描，0不扫描")
     private boolean pointScan;
+    private boolean required;
 
     public CoreSafecheckPlanToPoint() {
     }
 
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -61,4 +61,6 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
      * @return 结果
      */
     int deleteCoreSafecheckPlanByIds(Long[] ids);
+
+    List<String> selectItemIdsByPlanId(@Param("planId")Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/ICoreSafecheckPlanService.java

@@ -69,4 +69,6 @@ public interface ICoreSafecheckPlanService extends IService<CoreSafecheckPlan> {
      * @return Page
      */
     TableDataInfo<CoreSafecheckPlan> selectPage(CoreSafecheckPlan coreSafecheckPlan);
+
+    List<String> selectItemIdsByPlanId(Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.core.safetyCheck.service.impl;
 import java.util.List;
 
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.safetyCheck.domain.*;
 import com.xunmei.core.safetyCheck.mapper.*;
 import com.xunmei.core.safetyCheck.service.ICoreSafecheckPlanService;
@@ -74,6 +75,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
     }
 
+    @Override
+    public List<String> selectItemIdsByPlanId(Long id) {
+        return coreSafecheckPlanMapper.selectItemIdsByPlanId(id);
+    }
+
 
     /**
      * 查询常规安全检查计划
@@ -110,9 +116,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
         if (coreSafecheckPlan.getId() == null) {
             coreSafecheckPlan.setCreateTime(DateUtils.getNowDate());
+            coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlanMapper.insert(coreSafecheckPlan);
         }else {
             coreSafecheckPlan.setUpdateTime(DateUtils.getNowDate());
+            coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlanMapper.updateById(coreSafecheckPlan);
         }
 
@@ -148,7 +156,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(coreSafecheckPlan.getId());
             for (SafetyCheckRulePointVo s :
                     coreSafecheckPlan.getRulePointList()) {
-                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan()));
+                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan(),s.isRequired()));
 
             }
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointVo.java

@@ -38,4 +38,5 @@ public class SafetyCheckRulePointVo {
 
     private String businessType;
     private boolean pointScan;
+    private boolean required;
 }

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

@@ -59,6 +59,9 @@
             <result column="rule_point_point_name" property="pointName"/>
             <result column="rule_point_area_id" property="areaId"/>
             <result column="rule_point_area_name" property="areaName"/>
+            <result column="rule_point_business_type" property="businessType"/>
+            <result column="rule_point_point_scan" property="pointScan"/>
+            <result column="rule_point_required" property="required"/>
         </collection>
 
     </resultMap>
@@ -131,10 +134,14 @@
             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,
@@ -173,7 +180,26 @@
         FROM
         (
         SELECT
-        c.*,
+        c.plan_name,
+        c.plan_cycle,
+        c.exec_org_type,
+        c.check_org_type,
+        c.plan_status,
+        c.start_date,
+        c.end_date,
+        c.build_task_now,
+        c.description,
+        c.is_deleted,
+        c.create_time,
+        c.update_time,
+        c.modified_by,
+        u1.NAME AS modified_name,
+        c.source_type,
+        c.plan_create_org_id,
+        c.plan_of_org_id,
+        c.check_type,
+        c.count,
+        c.id,
         o1.NAME AS plan_create_org_name,
         o2.NAME AS plan_of_org_name,
         r.role_name,
@@ -192,7 +218,9 @@
         LEFT JOIN sys_org o3 ON o3.id = co.org_id
         LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
         LEFT JOIN sys_org o4 ON o4.id = eo.org_id
-        where 1=1
+        LEFT JOIN sys_user u1 ON u1.id = c.modified_by
+        WHERE
+        1 =1
         <if test="check.planName != null  and check.planName != ''">
             and c.plan_name like concat('%', #{check.planName}, '%')
         </if>
@@ -214,6 +242,11 @@
         </if>
         ) tem GROUP BY tem.id
     </select>
+    <select id="selectItemIdsByPlanId" resultType="java.lang.String">
+        select distinct point_id as item_id
+        from core_safecheck_plan_to_point
+        where plan_id = #{planId}
+    </select>
 
     <insert id="insertCoreSafecheckPlan" parameterType="com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan"
             useGeneratedKeys="true" keyProperty="id">