安全检查登记

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppResumptionDataRemarkimgServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.core.resumption.mapper.AppResumptionDataRemarkimgMapper;
@@ -35,6 +36,8 @@ public class AppResumptionDataRemarkimgServiceImpl extends ServiceImpl<AppResump
                 .eq(AppResumptionDataRemarkimg::getResumptionDataId,dataId)
                  .select(AppResumptionDataRemarkimg::getImgPath));
 
-       return  list.stream().map(i->i.getImgPath()).collect(Collectors.toList());
+       return  list.stream().filter(m-> ObjectUtil.isNotNull(m))
+               .map(i->i.getImgPath())
+               .collect(Collectors.toList());
     }
 }

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

@@ -4,6 +4,7 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.safetyCheck.dto.register.AppListDto;
+import com.xunmei.core.safetyCheck.dto.register.GrantDto;
 import com.xunmei.core.safetyCheck.service.SafetyCheckRegisterSerice;
 import com.xunmei.core.safetyCheck.vo.Regsiter.AppListVo;
 import com.xunmei.core.safetyCheck.vo.Regsiter.TaskRegisterVo;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 
@@ -32,16 +34,23 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "详情")
     @GetMapping("{id}")
-    @RequiresPermissions("safetycheck:register:query")
+//    @RequiresPermissions("safetycheck:register:query")
     public AjaxResult info(@PathVariable Long id) {
         return success(safetyCheckRegisterSerice.info(id));
     }
 
     @ApiOperation(value = "查询机构可用的规范")
     @PostMapping("submit")
-    @RequiresPermissions(value = {"safetycheck:register:register"})
+//    @RequiresPermissions(value = {"safetycheck:register:register"})
     public AjaxResult submit(@RequestBody TaskRegisterVo dto) {
         boolean r = safetyCheckRegisterSerice.submit(dto);
         return success(r);
     }
+
+    @ApiOperation(value = "授权")
+    @PostMapping("grant")
+    public AjaxResult grant(@RequestBody GrantDto dto) {
+        boolean r = safetyCheckRegisterSerice.grant(dto);
+        return success(r);
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/register/GrantDto.java

@@ -0,0 +1,15 @@
+package com.xunmei.core.safetyCheck.dto.register;
+
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class GrantDto {
+    private Long planId;
+
+    private Long taskId;
+
+    private Date ymdDate;
+
+    private Long userId;
+}

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

@@ -1,8 +1,10 @@
 package com.xunmei.core.safetyCheck.service;
 
 import com.xunmei.core.safetyCheck.dto.register.AppListDto;
+import com.xunmei.core.safetyCheck.dto.register.GrantDto;
 import com.xunmei.core.safetyCheck.vo.Regsiter.AppListVo;
 import com.xunmei.core.safetyCheck.vo.Regsiter.TaskRegisterVo;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -27,4 +29,11 @@ public interface SafetyCheckRegisterSerice {
      * @return
      */
     Boolean submit(TaskRegisterVo data);
+
+    /**
+     * 授权
+     * @param dto
+     * @return
+     */
+    Boolean  grant(GrantDto dto);
 }

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

@@ -155,7 +155,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 //            }
             for (SafetyCheckRulePointSelectVo s :
                     coreSafecheckPlan.getRulePointList()) {
-                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan()));
+//                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan()));
 
             }
         }

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.safetyCheck.service.impl;
 
 import com.xunmei.core.safetyCheck.dto.register.AppListDto;
+import com.xunmei.core.safetyCheck.dto.register.GrantDto;
 import com.xunmei.core.safetyCheck.service.SafetyCheckRegisterSerice;
 import com.xunmei.core.safetyCheck.vo.Regsiter.*;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,8 @@ public class SafetyCheckRegisterSericeImpl implements SafetyCheckRegisterSerice
         pointVo.setPointName("检查内容");
         pointVo.setMustCheck(1);
         pointVo.setIsAdd(0);
+        pointVo.setStatus(0);
+        itemVo.getPointList().add(pointVo);
 
         return vo;
     }
@@ -60,4 +63,9 @@ public class SafetyCheckRegisterSericeImpl implements SafetyCheckRegisterSerice
     public Boolean submit(TaskRegisterVo data) {
         return null;
     }
+
+    @Override
+    public Boolean grant(GrantDto dto) {
+        return null;
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.xunmei.core.safetyCheck.vo.Regsiter;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +12,7 @@ public class SafetyCheckDataRemarkingVo {
      * id
      */
     @ApiModelProperty("已检查数据的图片id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.safetyCheck.vo.Regsiter;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +13,7 @@ import java.util.List;
 @Data
 public class TaskRegisterAreaVo {
     @ApiModelProperty(value = "区域id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;
 
     @ApiModelProperty(value = "区域名称")

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

@@ -42,6 +42,7 @@ public class TaskRegisterPointVo {
     private String rectificationDeadline;
 
     @ApiModelProperty(value = "提交人id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long submitBy;
 
     @ApiModelProperty(value = "提交时间")

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

@@ -3,6 +3,8 @@ package com.xunmei.core.safetyCheck.vo.Regsiter;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +14,7 @@ import lombok.Data;
 @Data
 public class TaskRegisterVo {
     @ApiModelProperty(value = "任务id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private  Long id;
 
     @ApiModelProperty(value = "任务名称")
@@ -21,6 +24,7 @@ public class TaskRegisterVo {
     private String checkRoleNames;
 
     @ApiModelProperty(value = "计划id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
     @ApiModelProperty(value = "计划开始时间")
@@ -30,12 +34,14 @@ public class TaskRegisterVo {
     private Date planEndTime;
 
     @ApiModelProperty(value = "检查机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long checkOrgId;
 
     @ApiModelProperty(value = "检查机构名称")
     private String checkOrgName;
 
     @ApiModelProperty(value = "受检机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long beCheckedOrgId;
 
     @ApiModelProperty(value = "受检机构名称")