web检查登记格式调整

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

@@ -51,7 +51,7 @@ public class SafetyCheckRegisterController extends BaseController {
     @ApiOperation(value = "Web保存、提交")
     @PostMapping("websubmit")
 //    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
-    public AjaxResult websubmit(@RequestBody @Validated TaskRegisterVo<TaskRegisterAreaVo> dto) {
+    public AjaxResult websubmit(@RequestBody @Validated TaskRegisterVo<TaskRegisterRuleVo> dto) {
         boolean r = safetyCheckRegisterSerice.webSubmit(dto);
         return success(r);
     }
@@ -73,7 +73,7 @@ public class SafetyCheckRegisterController extends BaseController {
     @ApiOperation(value = "Web临时登记_保存、提交")
     @PostMapping("webtempsubmit")
 //    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
-    public AjaxResult webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> dto) {
+    public AjaxResult webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterRuleVo> dto) {
         boolean r = safetyCheckRegisterSerice.webTempSubmit(dto);
         return success(r);
     }

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

@@ -22,7 +22,7 @@ public interface SafetyCheckRegisterSerice {
      * @param id
      * @return
      */
-    TaskRegisterVo<TaskRegisterAreaVo> info(Long id);
+    TaskRegisterVo<TaskRegisterRuleVo> info(Long id);
 
     /**
      * app登记信息
@@ -43,9 +43,9 @@ public interface SafetyCheckRegisterSerice {
      * @param data
      * @return
      */
-    Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data);
+    Boolean webSubmit(TaskRegisterVo<TaskRegisterRuleVo> data);
 
-    Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> dto);
+    Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterRuleVo> dto);
 
     /**
      * 授权

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

@@ -3,7 +3,6 @@ package com.xunmei.core.safetyCheck.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -41,7 +40,6 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.model.LoginUser;
-import io.reactivex.rxjava3.core.Completable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -176,36 +174,35 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     }
 
     @Override
-    public TaskRegisterVo<TaskRegisterAreaVo> info(Long id) {
+    public TaskRegisterVo<TaskRegisterRuleVo> info(Long id) {
         TaskRegisterVo<AppTaskRegisterPointVo> appvo = getPointVos(id);
 
-        TaskRegisterVo<TaskRegisterAreaVo> vo = new TaskRegisterVo<>();
+        TaskRegisterVo<TaskRegisterRuleVo> vo = new TaskRegisterVo<>();
         BeanUtils.copyProperties(appvo, vo);
         vo.setCheckList(new ArrayList<>());
-        appvo.getCheckList().stream().collect(Collectors.groupingBy(AppTaskRegisterPointVo::getAreaId))
+        appvo.getCheckList().stream().collect(Collectors.groupingBy(AppTaskRegisterPointVo::getRuleId))
                 .forEach((k, list) -> {
-                    TaskRegisterAreaVo areavo = new TaskRegisterAreaVo();
-                    areavo.setAreaId(list.get(0).getAreaId());
-                    areavo.setAreaName(list.get(0).getAreaName());
-                    areavo.setItemList(new ArrayList<>());
-                    areavo.setNfcList(new ArrayList<>());
-                    vo.getCheckList().add(areavo);
+                    TaskRegisterRuleVo ruleVo = new TaskRegisterRuleVo();
+                    ruleVo.setRuleId(list.get(0).getRuleId());
+                    ruleVo.setRuleName(list.get(0).getRuleName());
+                    ruleVo.setItemList(new ArrayList<>());
+//                    ruleVo.setNfcList(new ArrayList<>());
+                    vo.getCheckList().add(ruleVo);
 
                     list.stream().collect(Collectors.groupingBy(AppTaskRegisterPointVo::getItemId))
                             .forEach((itemid, points) -> {
-                                TaskRegisterItemVo itemVo = new TaskRegisterItemVo();
+                                AppTaskRegisterItemVo itemVo = new AppTaskRegisterItemVo();
                                 itemVo.setItemId(points.get(0).getItemId());
                                 itemVo.setItemName(points.get(0).getItemName());
-                                itemVo.setPointList(points.stream().map(p -> {
-                                    if (CollectionUtil.isNotEmpty(p.getNfcList())) {
-                                        areavo.getNfcList().addAll(p.getNfcList());
-                                    }
-
-                                    TaskRegisterPointVo pointVo = new TaskRegisterPointVo();
-                                    BeanUtils.copyProperties(p, pointVo);
-                                    return pointVo;
-                                }).collect(Collectors.toList()));
-                                areavo.getItemList().add(itemVo);
+                                itemVo.setPointList(points);
+
+
+//                                points.stream().forEach(p -> {
+//                                    if (CollectionUtil.isNotEmpty(p.getNfcList())) {
+//                                        ruleVo.getNfcList().addAll(p.getNfcList());
+//                                    }
+//                                });
+                                ruleVo.getItemList().add(itemVo);
                             });
                 });
 
@@ -258,6 +255,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("受检机构没有机构类型");
         }
 
+
         /**
          * 已经完成任务的信息应该从任务信息中获取
          * 其它状态的任务消息从计划和任务中联合获取
@@ -374,28 +372,28 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      * @return
      */
     @Override
-    public Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data) {
+    public Boolean webSubmit(TaskRegisterVo<TaskRegisterRuleVo> data) {
         return webSubmit(data, false);
     }
 
-    private Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data, Boolean isNewTask) {
+    private Boolean webSubmit(TaskRegisterVo<TaskRegisterRuleVo> data, Boolean isNewTask) {
         TaskRegisterVo<AppTaskRegisterPointVo> appdata = new TaskRegisterVo<AppTaskRegisterPointVo>();
         BeanUtils.copyProperties(data, appdata);
         appdata.setCheckList(new ArrayList<>());
-        for (TaskRegisterAreaVo areaVo : data.getCheckList()) {
-            boolean firstPoint = true;
-            for (TaskRegisterItemVo itemVo : areaVo.getItemList()) {
-                for (TaskRegisterPointVo pointVo : itemVo.getPointList()) {
-                    AppTaskRegisterPointVo appPointVo = new AppTaskRegisterPointVo();
-                    BeanUtils.copyProperties(pointVo, appPointVo);
-                    BeanUtils.copyProperties(itemVo, appPointVo);
-                    BeanUtils.copyProperties(areaVo, appPointVo);
-                    appPointVo.setNfcList(new ArrayList<>());
-                    if (firstPoint) {
-                        appPointVo.setNfcList(areaVo.getNfcList());
-                        firstPoint = false;
-                    }
-                    appdata.getCheckList().add(appPointVo);
+        for (TaskRegisterRuleVo areaVo : data.getCheckList()) {
+//            boolean firstPoint = true;
+            for (AppTaskRegisterItemVo itemVo : areaVo.getItemList()) {
+                for (AppTaskRegisterPointVo pointVo : itemVo.getPointList()) {
+//                    AppTaskRegisterPointVo appPointVo = new AppTaskRegisterPointVo();
+//                    BeanUtils.copyProperties(pointVo, appPointVo);
+//                    BeanUtils.copyProperties(itemVo, appPointVo);
+//                    BeanUtils.copyProperties(areaVo, appPointVo);
+//                    appPointVo.setNfcList(new ArrayList<>());
+//                    if (firstPoint) {
+//                        appPointVo.setNfcList(areaVo.getNfcList());
+//                        firstPoint = false;
+//                    }
+                    appdata.getCheckList().add(pointVo);
                 }
             }
         }
@@ -410,7 +408,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      * @return
      */
     @Override
-    public Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> data) {
+    public Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterRuleVo> data) {
         if (ObjectUtil.isNull(data.getId())) {
             data.setId(IDHelper.id());
         }

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

@@ -26,7 +26,7 @@ public class CheckNfcRecord {
     @ApiModelProperty("执行时间")
     private Date executeTime;
 
-    private  int scanMethod;
+    private  Integer scanMethod;
 
     private String img;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/AppTaskRegisterPointVo.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.safetyCheck.vo.regsiter;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,12 @@ import java.util.List;
 
 @Data
 public class AppTaskRegisterPointVo {
+    @ApiModelProperty(value = "手册id")
+    private Long ruleId;
+
+    @ApiModelProperty(value = "检查手册名称")
+    private String ruleName;
+
     @ApiModelProperty(value = "区域id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterRuleVo.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.safetyCheck.vo.regsiter;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskRegisterRuleVo {
+    @ApiModelProperty(value = "检查手册id")
+    private Long ruleId;
+
+    @ApiModelProperty(value = "检查手册名称")
+    private String ruleName;
+
+    @ApiModelProperty(value = "检查项列表")
+    private List<AppTaskRegisterItemVo> itemList;
+
+//    @ApiModelProperty(value = "NFC列表")
+//    private List<TaskRegisterNfcVo> nfcList;
+}

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

@@ -659,7 +659,10 @@ SELECT t.id,
     </delete>
 
     <select id="selectPoint" resultType="com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo">
-        (SELECT f.id as areaId,
+        (SELECT
+        r.id as ruleId,
+        r.name as ruleName,
+        f.id as areaId,
         f.name as areaName,
         e.id as itemId,
         e.name as itemName,
@@ -691,7 +694,10 @@ SELECT t.id,
         </choose>
         and a.deleted = 0)
         union
-        (SELECT f.id as areaId,
+        (SELECT
+        r.id as ruleId,
+        r.name as ruleName,
+        f.id as areaId,
         f.name as areaName,
         e.id as itemId,
         e.name as itemName,
@@ -708,13 +714,17 @@ SELECT t.id,
         FROM core_safety_task_data rd
         LEFT JOIN core_safetycheck_rule_point a ON a.id = rd.point_id
         LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
+        left join core_safetycheck_rule r on a.rule_id=r.id
         LEFT JOIN sys_area f ON a.area_id = f.id
         WHERE rd.task_id = #{taskId}
         and rd.is_add = 1
         and a.deleted = 0)
     </select>
     <select id="selectPointByTask" resultType="com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo">
-        SELECT f.id                      as areaId,
+        SELECT
+            r.id as ruleId,
+            r.name as ruleName,
+            f.id                      as areaId,
                f.name                    as areaName,
                e.id                      as itemId,
                e.name                    as itemName,
@@ -732,6 +742,7 @@ SELECT t.id,
                  LEFT JOIN core_safetycheck_rule_point a ON a.id = rd.point_id
                  LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
                  LEFT JOIN sys_area f ON a.area_id = f.id
+                 left join core_safetycheck_rule r on a.rule_id=r.id
         WHERE rd.task_id = #{taskId}
           and a.deleted = 0
     </select>
@@ -867,7 +878,7 @@ SELECT t.id,
                t.submit_time as execute_time
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
-        where t.task_id = #{taskId}
+        where t.task_id = #{taskId} and t.status=1
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">