安全检查登记、授权实现及调试

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -8,10 +8,7 @@ import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +24,7 @@ public interface RemoteRoleService {
     SysRole getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/role/getNames")
-    List<IdNameVo> getNames(RoleConditionEto condition);
+    List<IdNameVo> getNames(@RequestBody RoleConditionEto condition);
 
     @GetMapping("/role/selectUserByRoleNameAndOrgId")
     List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName,@RequestParam(value = "orgId")  Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

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

@@ -100,7 +100,7 @@ public class CoreSafecheckPlanController extends BaseController {
         return toAjax(coreSafecheckPlanService.updateCoreSafecheckPlan(coreSafecheckPlan));
     }
     @PostMapping("/distribute")
-    @RequiresPermissions("core:checkplan:distribute")
+//    @RequiresPermissions("core:checkplan:distribute")
     public AjaxResult distribute(@RequestBody DistributeDto dto) {
         try {
             coreSafecheckPlanService.distributeToOrg(dto);

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

@@ -1,95 +0,0 @@
-package com.xunmei.core.safetyCheck.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskData;
-import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.xunmei.common.log.annotation.Log;
-import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 安全检查项Controller
- *
- * @author xunmei
- * @date 2023-09-19
- */
-@Api(tags = {"CoreSafetyTaskData"})
-@RestController
-@RequestMapping("/Safetydata")
-public class CoreSafetyTaskDataController extends BaseController {
-    @Autowired
-    private ICoreSafetyTaskDataService coreSafetyTaskDataService;
-
-    /**
-     * 查询安全检查项列表
-     */
-    @ApiOperation(value = "查询CoreSafetyTaskData列表")
-    @RequiresPermissions("system:data:list")
-    @GetMapping("/list")
-    public TableDataInfo<CoreSafetyTaskData> list(CoreSafetyTaskData coreSafetyTaskData) {
-
-        return coreSafetyTaskDataService.selectPage(coreSafetyTaskData);
-    }
-
-
-    /**
-     * 获取安全检查项详细信息
-     */
-    @ApiOperation(value = "获取CoreSafetyTaskData详细信息")
-    @RequiresPermissions("system:data:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreSafetyTaskDataService.selectCoreSafetyTaskDataById(id));
-    }
-
-    /**
-     * 新增安全检查项
-     */
-    @ApiOperation(value = "新增CoreSafetyTaskData")
-    @RequiresPermissions("system:data:add")
-    @Log(title = "安全检查项", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CoreSafetyTaskData coreSafetyTaskData) {
-        return toAjax(coreSafetyTaskDataService.insertCoreSafetyTaskData(coreSafetyTaskData));
-    }
-
-    /**
-     * 修改安全检查项
-     */
-    @ApiOperation(value = "修改CoreSafetyTaskData")
-    @RequiresPermissions("system:data:edit")
-    @Log(title = "安全检查项", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CoreSafetyTaskData coreSafetyTaskData) {
-        return toAjax(coreSafetyTaskDataService.updateCoreSafetyTaskData(coreSafetyTaskData));
-    }
-
-    /**
-     * 删除安全检查项
-     */
-    @ApiOperation(value = "删除CoreSafetyTaskData")
-    @RequiresPermissions("system:data:remove")
-    @Log(title = "安全检查项", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreSafetyTaskDataService.deleteCoreSafetyTaskDataByIds(ids));
-    }
-}

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

@@ -1,95 +0,0 @@
-package com.xunmei.core.safetyCheck.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataNfc;
-import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataNfcService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.xunmei.common.log.annotation.Log;
-import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 安全检查nfc扫描Controller
- *
- * @author xunmei
- * @date 2023-09-19
- */
-@Api(tags = {"CoreSafetyTaskDataNfc"})
-@RestController
-@RequestMapping("/Safetynfc")
-public class CoreSafetyTaskDataNfcController extends BaseController {
-    @Autowired
-    private ICoreSafetyTaskDataNfcService coreSafetyTaskDataNfcService;
-
-    /**
-     * 查询安全检查nfc扫描列表
-     */
-    @ApiOperation(value = "查询CoreSafetyTaskDataNfc列表")
-    @RequiresPermissions("system:nfc:list")
-    @GetMapping("/list")
-    public TableDataInfo<CoreSafetyTaskDataNfc> list(CoreSafetyTaskDataNfc coreSafetyTaskDataNfc) {
-
-        return coreSafetyTaskDataNfcService.selectPage(coreSafetyTaskDataNfc);
-    }
-
-
-    /**
-     * 获取安全检查nfc扫描详细信息
-     */
-    @ApiOperation(value = "获取CoreSafetyTaskDataNfc详细信息")
-    @RequiresPermissions("system:nfc:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreSafetyTaskDataNfcService.selectCoreSafetyTaskDataNfcById(id));
-    }
-
-    /**
-     * 新增安全检查nfc扫描
-     */
-    @ApiOperation(value = "新增CoreSafetyTaskDataNfc")
-    @RequiresPermissions("system:nfc:add")
-    @Log(title = "安全检查nfc扫描", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CoreSafetyTaskDataNfc coreSafetyTaskDataNfc) {
-        return toAjax(coreSafetyTaskDataNfcService.insertCoreSafetyTaskDataNfc(coreSafetyTaskDataNfc));
-    }
-
-    /**
-     * 修改安全检查nfc扫描
-     */
-    @ApiOperation(value = "修改CoreSafetyTaskDataNfc")
-    @RequiresPermissions("system:nfc:edit")
-    @Log(title = "安全检查nfc扫描", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CoreSafetyTaskDataNfc coreSafetyTaskDataNfc) {
-        return toAjax(coreSafetyTaskDataNfcService.updateCoreSafetyTaskDataNfc(coreSafetyTaskDataNfc));
-    }
-
-    /**
-     * 删除安全检查nfc扫描
-     */
-    @ApiOperation(value = "删除CoreSafetyTaskDataNfc")
-    @RequiresPermissions("system:nfc:remove")
-    @Log(title = "安全检查nfc扫描", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreSafetyTaskDataNfcService.deleteCoreSafetyTaskDataNfcByIds(ids));
-    }
-}

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

@@ -1,91 +0,0 @@
-package com.xunmei.core.safetyCheck.controller;
-
-
-import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
-import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataRemarkimgService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.xunmei.common.log.annotation.Log;
-import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 安全检查产生图片Controller
- *
- * @author xunmei
- * @date 2023-09-19
- */
-@Api(tags = {"CoreSafetyTaskDataRemarkimg"})
-@RestController
-@RequestMapping("/Safetyremarkimg")
-public class CoreSafetyTaskDataRemarkimgController extends BaseController {
-    @Autowired
-    private ICoreSafetyTaskDataRemarkimgService coreSafetyTaskDataRemarkimgService;
-
-    /**
-     * 查询安全检查产生图片列表
-     */
-    @ApiOperation(value = "查询CoreSafetyTaskDataRemarkimg列表")
-    @RequiresPermissions("system:remarkimg:list")
-    @GetMapping("/list")
-    public TableDataInfo<CoreSafetyTaskDataRemarkimg> list(CoreSafetyTaskDataRemarkimg coreSafetyTaskDataRemarkimg) {
-
-        return coreSafetyTaskDataRemarkimgService.selectPage(coreSafetyTaskDataRemarkimg);
-    }
-
-
-    /**
-     * 获取安全检查产生图片详细信息
-     */
-    @ApiOperation(value = "获取CoreSafetyTaskDataRemarkimg详细信息")
-    @RequiresPermissions("system:remarkimg:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreSafetyTaskDataRemarkimgService.selectCoreSafetyTaskDataRemarkimgById(id));
-    }
-
-    /**
-     * 新增安全检查产生图片
-     */
-    @ApiOperation(value = "新增CoreSafetyTaskDataRemarkimg")
-    @RequiresPermissions("system:remarkimg:add")
-    @Log(title = "安全检查产生图片", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CoreSafetyTaskDataRemarkimg coreSafetyTaskDataRemarkimg) {
-        return toAjax(coreSafetyTaskDataRemarkimgService.insertCoreSafetyTaskDataRemarkimg(coreSafetyTaskDataRemarkimg));
-    }
-
-    /**
-     * 修改安全检查产生图片
-     */
-    @ApiOperation(value = "修改CoreSafetyTaskDataRemarkimg")
-    @RequiresPermissions("system:remarkimg:edit")
-    @Log(title = "安全检查产生图片", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CoreSafetyTaskDataRemarkimg coreSafetyTaskDataRemarkimg) {
-        return toAjax(coreSafetyTaskDataRemarkimgService.updateCoreSafetyTaskDataRemarkimg(coreSafetyTaskDataRemarkimg));
-    }
-
-    /**
-     * 删除安全检查产生图片
-     */
-    @ApiOperation(value = "删除CoreSafetyTaskDataRemarkimg")
-    @RequiresPermissions("system:remarkimg:remove")
-    @Log(title = "安全检查产生图片", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreSafetyTaskDataRemarkimgService.deleteCoreSafetyTaskDataRemarkimgByIds(ids));
-    }
-}

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

@@ -7,10 +7,7 @@ import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.safetyCheck.dto.register.AppPageDto;
 import com.xunmei.core.safetyCheck.dto.register.GrantDto;
 import com.xunmei.core.safetyCheck.service.SafetyCheckRegisterSerice;
-import com.xunmei.core.safetyCheck.vo.regsiter.AppPageVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterAreaVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterVo;
+import com.xunmei.core.safetyCheck.vo.regsiter.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -59,7 +56,7 @@ public class SafetyCheckRegisterController extends BaseController {
     @ApiOperation(value = "App保存、提交")
     @PostMapping("appsubmit")
 //    @RequiresPermissions(value = {"safetycheck:register:register"})
-    public AjaxResult appSubmit(@RequestBody TaskRegisterVo<AppTaskRegisterPointVo> dto) {
+    public AjaxResult appSubmit(@RequestBody TaskRegisterVo<AppTaskRegisterItemVo> dto) {
         boolean r = safetyCheckRegisterSerice.appSubmit(dto);
         return success(r);
     }

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

@@ -94,7 +94,7 @@ public class CoreSafetyTask extends BaseEntity {
      * 0待检查,1检查完成
      */
     @ApiModelProperty(value = "0待检查,1检查完成")
-    private Long status;
+    private Integer status;
 
     /**
      * 0:代办,1:逾期,2:按时,3:补登

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

@@ -26,7 +26,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Accessors(chain = true)
 @TableName("core_safety_task_data")
 @ApiModel(value = "CoreSafetyTaskData对象", description = "安全检查项")
-public class CoreSafetyTaskData extends BaseEntity {
+public class CoreSafetyTaskData{
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -26,7 +26,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Accessors(chain = true)
 @TableName("core_safety_task_data_nfc")
 @ApiModel(value = "CoreSafetyTaskDataNfc对象", description = "安全检查nfc扫描")
-public class CoreSafetyTaskDataNfc extends BaseEntity {
+public class CoreSafetyTaskDataNfc {
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -23,7 +23,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Accessors(chain = true)
 @TableName("core_safety_task_data_remarkimg")
 @ApiModel(value = "CoreSafetyTaskDataRemarkimg对象", description = "安全检查产生图片")
-public class CoreSafetyTaskDataRemarkimg extends BaseEntity {
+public class CoreSafetyTaskDataRemarkimg {
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -13,13 +13,17 @@ public class GrantDto {
     @NotNull
     private Long planId;
 
+    @ApiModelProperty("被检机构id")
     @NotNull
-    @ApiModelProperty("任务id")
-    private Long taskId;
+    private Long beCheckedOrgId;
 
     @NotNull
-    @ApiModelProperty("任务日期")
+    @ApiModelProperty("周期开始日期")
     private Date ymdDate;
 
+    @NotNull
+    @ApiModelProperty("任务id")
+    private Long taskId;
+
     private Long userId;
 }

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

@@ -342,7 +342,7 @@ public class SafetyCheckJobBusiness {
             checkTask.setOrgPath(taskPlan.getExecOrg().getPath());
             checkTask.setCheckOrgId(taskPlan.getCheckOrg().getId());
             checkTask.setCheckOrgName(taskPlan.getCheckOrg().getName());
-            checkTask.setStatus(1L);
+            checkTask.setStatus(1);
             checkTask.setDoneStatus(0);
             checkTask.setCheckType(0L);
             checkTask.setCheckCycle(Long.valueOf(taskPlan.getPlanCycle()));

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

@@ -62,11 +62,4 @@ public interface ICoreSafetyTaskDataNfcService extends IService<CoreSafetyTaskDa
      */
     int deleteCoreSafetyTaskDataNfcById(Long id);
 
-    /**
-     * 查询安全检查nfc扫描分页数据
-     *
-     * @param coreSafetyTaskDataNfc 查询条件对象
-     * @return Page
-     */
-    TableDataInfo<CoreSafetyTaskDataNfc> selectPage(CoreSafetyTaskDataNfc coreSafetyTaskDataNfc);
 }

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

@@ -62,11 +62,4 @@ public interface ICoreSafetyTaskDataRemarkimgService extends IService<CoreSafety
      */
     int deleteCoreSafetyTaskDataRemarkimgById(Long id);
 
-    /**
-     * 查询安全检查产生图片分页数据
-     *
-     * @param coreSafetyTaskDataRemarkimg 查询条件对象
-     * @return Page
-     */
-    TableDataInfo<CoreSafetyTaskDataRemarkimg> selectPage(CoreSafetyTaskDataRemarkimg coreSafetyTaskDataRemarkimg);
 }

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

@@ -62,11 +62,4 @@ public interface ICoreSafetyTaskDataService extends IService<CoreSafetyTaskData>
      */
     int deleteCoreSafetyTaskDataById(Long id);
 
-    /**
-     * 查询安全检查项分页数据
-     *
-     * @param coreSafetyTaskData 查询条件对象
-     * @return Page
-     */
-    TableDataInfo<CoreSafetyTaskData> selectPage(CoreSafetyTaskData coreSafetyTaskData);
 }

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

@@ -3,10 +3,7 @@ package com.xunmei.core.safetyCheck.service;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.safetyCheck.dto.register.AppPageDto;
 import com.xunmei.core.safetyCheck.dto.register.GrantDto;
-import com.xunmei.core.safetyCheck.vo.regsiter.AppPageVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterAreaVo;
-import com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterVo;
+import com.xunmei.core.safetyCheck.vo.regsiter.*;
 
 import java.util.List;
 
@@ -30,15 +27,14 @@ public interface SafetyCheckRegisterSerice {
      * @param id
      * @return
      */
-    TaskRegisterVo<AppTaskRegisterPointVo> appInfo(Long id);
+    TaskRegisterVo<AppTaskRegisterItemVo> appInfo(Long id);
 
     /**
      * 登记
      * @param data
      * @return
      */
-    Boolean appSubmit(TaskRegisterVo<AppTaskRegisterPointVo> data);
-
+    Boolean appSubmit(TaskRegisterVo<AppTaskRegisterItemVo> data);
 
     /**
      * 登记

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

@@ -26,43 +26,6 @@ public class CoreSafetyTaskDataNfcServiceImpl extends ServiceImpl<CoreSafetyTask
 //    @Autowired
 //    private ISysOrgService orgService;
 
-    @Override
-    public TableDataInfo<CoreSafetyTaskDataNfc> selectPage(CoreSafetyTaskDataNfc coreSafetyTaskDataNfc) {
-        //未删除
-//        coreSafetyTaskDataNfc.setDeleted(0L);
-        Page<CoreSafetyTaskDataNfc> page;
-        //分页
-        if (coreSafetyTaskDataNfc.getPageNum()!=null&&coreSafetyTaskDataNfc.getPageSize()!=null)
-        {
-            page = new Page<>(coreSafetyTaskDataNfc.getPageNum(), coreSafetyTaskDataNfc.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreSafetyTaskDataNfc> query = new QueryWrapper<>(coreSafetyTaskDataNfc);
-        //下穿
-//        if (coreSafetyTaskDataNfc.getCheckSub()){
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(coreSafetyTaskDataNfc.getOrgId());
-//            //清空前端传递的org_id
-//            coreSafetyTaskDataNfc.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id",ids);
-//        }
-        //时间范围查询
-        if (coreSafetyTaskDataNfc.getParams().get("beginTime")!=null&&coreSafetyTaskDataNfc.getParams().get("endTime")!=null){
-            query.between("create_time", coreSafetyTaskDataNfc.getParams().get("beginTime"), coreSafetyTaskDataNfc.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreSafetyTaskDataNfcMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-
-
-
-
-    }
-
-
     /**
      * 查询安全检查nfc扫描
      *

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

@@ -26,41 +26,6 @@ public class CoreSafetyTaskDataRemarkimgServiceImpl extends ServiceImpl<CoreSafe
 //    @Autowired
 //    private ISysOrgService orgService;
 
-    @Override
-    public TableDataInfo<CoreSafetyTaskDataRemarkimg> selectPage(CoreSafetyTaskDataRemarkimg coreSafetyTaskDataRemarkimg) {
-        //未删除
-//        coreSafetyTaskDataRemarkimg.setDeleted(0L);
-        Page<CoreSafetyTaskDataRemarkimg> page;
-        //分页
-        if (coreSafetyTaskDataRemarkimg.getPageNum()!=null&&coreSafetyTaskDataRemarkimg.getPageSize()!=null)
-        {
-            page = new Page<>(coreSafetyTaskDataRemarkimg.getPageNum(), coreSafetyTaskDataRemarkimg.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreSafetyTaskDataRemarkimg> query = new QueryWrapper<>(coreSafetyTaskDataRemarkimg);
-//        //下穿
-//        if (coreSafetyTaskDataRemarkimg.getCheckSub()){
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(coreSafetyTaskDataRemarkimg.getOrgId());
-//            //清空前端传递的org_id
-//            coreSafetyTaskDataRemarkimg.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id",ids);
-//        }
-        //时间范围查询
-        if (coreSafetyTaskDataRemarkimg.getParams().get("beginTime")!=null&&coreSafetyTaskDataRemarkimg.getParams().get("endTime")!=null){
-            query.between("create_time", coreSafetyTaskDataRemarkimg.getParams().get("beginTime"), coreSafetyTaskDataRemarkimg.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreSafetyTaskDataRemarkimgMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-
-
-
-
-    }
 
 
     /**

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

@@ -26,43 +26,6 @@ public class CoreSafetyTaskDataServiceImpl extends ServiceImpl<CoreSafetyTaskDat
 //    @Autowired
 //    private ISysOrgService orgService;
 
-    @Override
-    public TableDataInfo<CoreSafetyTaskData> selectPage(CoreSafetyTaskData coreSafetyTaskData) {
-        //未删除
-//        coreSafetyTaskData.setDeleted(0L);
-        Page<CoreSafetyTaskData> page;
-        //分页
-        if (coreSafetyTaskData.getPageNum()!=null&&coreSafetyTaskData.getPageSize()!=null)
-        {
-            page = new Page<>(coreSafetyTaskData.getPageNum(), coreSafetyTaskData.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreSafetyTaskData> query = new QueryWrapper<>(coreSafetyTaskData);
-        //下穿
-//        if (coreSafetyTaskData.getCheckSub()){
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(coreSafetyTaskData.getOrgId());
-//            //清空前端传递的org_id
-//            coreSafetyTaskData.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id",ids);
-//        }
-        //时间范围查询
-        if (coreSafetyTaskData.getParams().get("beginTime")!=null&&coreSafetyTaskData.getParams().get("endTime")!=null){
-            query.between("create_time", coreSafetyTaskData.getParams().get("beginTime"), coreSafetyTaskData.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreSafetyTaskDataMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-
-
-
-
-    }
-
-
     /**
      * 查询安全检查项
      *

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

@@ -66,8 +66,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
     @Resource
     private IQuestionService questionService;
-    //    CoreSafety
-//    @Resource
+
     @Resource
     RemoteRoleService remoteRoleService;
 
@@ -125,7 +124,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
     @Override
     public TaskRegisterVo<TaskRegisterAreaVo> info(Long id) {
-        TaskRegisterVo<AppTaskRegisterPointVo> appvo = appInfo(id);
+        TaskRegisterVo<AppTaskRegisterPointVo> appvo = getPointVos(id);
 
         TaskRegisterVo<TaskRegisterAreaVo> vo = new TaskRegisterVo<>();
         BeanUtils.copyProperties(appvo, vo);
@@ -156,11 +155,35 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                                 areavo.getItemList().add(itemVo);
                             });
                 });
+
         return vo;
     }
 
     @Override
-    public TaskRegisterVo<AppTaskRegisterPointVo> appInfo(Long id) {
+    public TaskRegisterVo<AppTaskRegisterItemVo> appInfo(Long id) {
+        TaskRegisterVo<AppTaskRegisterPointVo> baseData = getPointVos(id);
+        Map<Long, List<AppTaskRegisterPointVo>> groupByItem = baseData.getCheckList()
+                .stream()
+                .collect(Collectors.groupingBy(AppTaskRegisterPointVo::getItemId));
+
+        TaskRegisterVo<AppTaskRegisterItemVo> vo = new TaskRegisterVo<AppTaskRegisterItemVo>();
+        BeanUtils.copyProperties(baseData, vo);
+        List<AppTaskRegisterItemVo> itemVos = new ArrayList<>();
+        for (Long itemId : groupByItem.keySet()) {
+            List<AppTaskRegisterPointVo> pointVos = groupByItem.get(itemId);
+            AppTaskRegisterItemVo itemVo = new AppTaskRegisterItemVo();
+            itemVo.setItemId(pointVos.get(0).getItemId());
+            itemVo.setItemName(pointVos.get(0).getItemName());
+            itemVo.setPointList(pointVos);
+
+            itemVos.add(itemVo);
+        }
+        vo.setCheckList(itemVos);
+
+        return vo;
+    }
+
+    private TaskRegisterVo<AppTaskRegisterPointVo> getPointVos(Long id) {
         CoreSafetyTask task = coreSafetyTaskMapper.selectById(id);
         if (ObjectUtil.isNull(task)) {
             throw new ServiceException("任务不存在");
@@ -192,8 +215,6 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
         List<TaskRegisterNfcVo> nfcs = baseMapper.selectNfc(plan.getId(), id, task.getOrgId());
         TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, plan.getCheckOrgType().toString(), StringUtils.join(roleNames, ","));
-
-        vo.setCheckList(new ArrayList<>());
         Set<Long> usedNfcId = new HashSet<>();
         for (AppTaskRegisterPointVo point : points) {
             List<CoreSafetyTaskDataRemarkimg> dataImgs = taskImgs.get(point.getPointDataId());
@@ -210,9 +231,9 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                     .collect(Collectors.toList());
             usedNfcId.addAll(areaNfcs.stream().map(TaskRegisterNfcVo::getNfcId).collect(Collectors.toList()));
             point.setNfcList(areaNfcs);
-
-            vo.getCheckList().add(point);
         }
+        vo.setCheckList(points);
+
         return vo;
     }
 
@@ -223,8 +244,15 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      * @return
      */
     @Override
-    public Boolean appSubmit(TaskRegisterVo<AppTaskRegisterPointVo> data) {
-        return submit(data);
+    public Boolean appSubmit(TaskRegisterVo<AppTaskRegisterItemVo> data) {
+        TaskRegisterVo<AppTaskRegisterPointVo> pointData = new TaskRegisterVo<AppTaskRegisterPointVo>();
+        BeanUtils.copyProperties(data, pointData);
+        pointData.setCheckList(new ArrayList<>());
+        for (AppTaskRegisterItemVo itemVo : data.getCheckList()) {
+            pointData.getCheckList().addAll(itemVo.getPointList());
+        }
+
+        return submit(pointData);
     }
 
     /**
@@ -272,7 +300,6 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
         removeExistData(data.getId());
 
-
         List<CoreSafetyTaskData> points = new ArrayList();
         List<CoreSafetyTaskDataNfc> nfcs = new ArrayList<>();
         List<CoreSafetyTaskDataRemarkimg> remarkimgs = new ArrayList<>();
@@ -280,14 +307,18 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         for (AppTaskRegisterPointVo pointVo : data.getCheckList()) {
             CoreSafetyTaskData point = dataVoToDomain(data, pointVo);
             points.add(point);
-            for (TaskRegisterNfcVo taskRegisterNfcVo : pointVo.getNfcList()) {
-                CoreSafetyTaskDataNfc nfc = nfcVoToDomain(data, point, taskRegisterNfcVo);
-                nfcs.add(nfc);
+            if (CollectionUtil.isNotEmpty(pointVo.getNfcList())) {
+                for (TaskRegisterNfcVo taskRegisterNfcVo : pointVo.getNfcList()) {
+                    CoreSafetyTaskDataNfc nfc = nfcVoToDomain(data, point, taskRegisterNfcVo);
+                    nfcs.add(nfc);
+                }
             }
 
-            for (SafetyCheckDataRemarkingVo imgDatum : pointVo.getImgData()) {
-                CoreSafetyTaskDataRemarkimg img = imgVoToDomain(data, point, imgDatum);
-                remarkimgs.add(img);
+            if (CollectionUtil.isNotEmpty(pointVo.getImgData())) {
+                for (SafetyCheckDataRemarkingVo imgDatum : pointVo.getImgData()) {
+                    CoreSafetyTaskDataRemarkimg img = imgVoToDomain(data, point, imgDatum);
+                    remarkimgs.add(img);
+                }
             }
 
             if (ObjectUtil.equal(point.getValue(), 1)) {
@@ -389,7 +420,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 .set(CoreSafetyTask::getSubmitTime, new Date())
                 .set(CoreSafetyTask::getSubmitorId, SecurityUtils.getUserId())
                 .set(CoreSafetyTask::getSubmitBy, SecurityUtils.getLoginUser().getName())
-                .set(CoreSafetyTask::getExceptionCount, exceptionCount);
+                .set(CoreSafetyTask::getExceptionCount, exceptionCount)
+                .set(CoreSafetyTask::getCheckTeam, data.getCheckTeam());
         return baseMapper.update(null, taskUpdateWraper) > 0;
     }
 
@@ -411,6 +443,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     public Boolean grant(GrantDto dto) {
         LambdaQueryWrapper<CoreSafetyTask> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CoreSafetyTask::getPlanId, dto.getPlanId())
+                .eq(CoreSafetyTask::getOrgId,dto.getBeCheckedOrgId())
                 .eq(CoreSafetyTask::getYmdDate, dto.getYmdDate());
         List<CoreSafetyTask> tasks = baseMapper.selectList(wrapper);
         Optional<CoreSafetyTask> taskOptional = tasks.stream().filter(t -> ObjectUtil.equal(t.getId(), dto.getTaskId())).findFirst();

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

@@ -0,0 +1,21 @@
+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;
+
+import java.util.List;
+
+@Data
+public class AppTaskRegisterItemVo {
+    @ApiModelProperty(value = "检查项id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    @ApiModelProperty(value = "检查项")
+    private String itemName;
+
+    @ApiModelProperty(value = "检查内容列表")
+    private List<AppTaskRegisterPointVo> pointList;
+}

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

@@ -3,10 +3,14 @@ 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.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 public class SafetyCheckDataRemarkingVo {
     /**

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

@@ -3,6 +3,7 @@ package com.xunmei.core.safetyCheck.vo.regsiter;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
@@ -55,9 +56,16 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "检查组成员")
     private String checkTeam;
 
+    @ApiModelProperty(value = "任务周期的开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ymdDate;
+
     @ApiModelProperty(value = "0：保存、1：提交")
     private Integer isSubmit;
 
+    @ApiModelProperty(value = "任务状态")
+    private Integer status;
+
     @ApiModelProperty(value = "检查列表")
     private List<T> checkList;
 
@@ -67,7 +75,7 @@ public class TaskRegisterVo<T> {
         vo.setTaskName(task.getTitle());
         vo.setPlanId(task.getPlanId());
         vo.setPlanStartTime(task.getPlanStartTime());
-        vo.setPlanEndTime(task.getEndTime());
+        vo.setPlanEndTime(task.getPlanEndTime());
         vo.setCheckOrgId(task.getCheckOrgId());
         vo.setCheckOrgName(task.getCheckOrgName());
         vo.setBeCheckedOrgId(task.getOrgId());
@@ -75,7 +83,8 @@ public class TaskRegisterVo<T> {
         vo.setBeCheckOrgType(beCheckOrgType);
         vo.setCheckTeam(task.getCheckTeam());
         vo.setCheckRoleNames(checkRoleNames);
-
+        vo.setStatus(task.getDoneStatus());
+        vo.setYmdDate(task.getYmdDate());
         return  vo;
     }
 }

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

@@ -233,10 +233,7 @@
             <foreach collection="task.checkOrgIds" close=")" open="(" separator="," item="id">
                 #{id}
             </foreach>
-
         </if>
-
-
     </select>
 
     <insert id="insertCoreSafetyTask" parameterType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
@@ -624,28 +621,50 @@
     </delete>
 
     <select id="selectPoint" resultType="com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo">
-        SELECT f.id                                as areaId,
-               f.name                              as areaName,
-               e.id                                as itemId,
-               e.name                              as itemName,
-               rd.id                               as pointDataId,
-               a.id                                as pointId,
-               a.name                              as pointName,
-               b.required                          as mustCheck,
-               if(rd.is_add is null, 0, rd.is_add) as isAdd,
-               if(rd.value is null, 0, rd.value)   as status,
-               if(rd.remark is null, 0, rd.remark) as remark,
-               rd.rectification_deadline           as rectificationDeadline,
-               rd.submit_by,
-               rd.submit_time
-        FROM core_safecheck_plan_to_point b
-                 LEFT JOIN core_safetycheck_rule_point a ON a.id = b.point_id
-                 LEFT JOIN core_safecheck_plan c ON b.plan_id = c.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_safety_task_data rd ON rd.item_id = b.point_id and rd.task_id = #{taskId}
-        WHERE c.id = #{planId}
-          and a.deleted = 0
+        (SELECT f.id                                   as areaId,
+                f.name                                 as areaName,
+                e.id                                   as itemId,
+                e.name                                 as itemName,
+                rd.id                                  as pointDataId,
+                a.id                                   as pointId,
+                a.name                                 as pointName,
+                b.required                             as mustCheck,
+                if(rd.is_add is null, 0, rd.is_add)    as isAdd,
+                if(rd.value is null, 0, rd.value)      as status,
+                if(rd.remark is null, null, rd.remark) as remark,
+                rd.rectification_deadline              as rectificationDeadline,
+                rd.submit_by,
+                rd.submit_time
+         FROM core_safecheck_plan_to_point b
+                  LEFT JOIN core_safetycheck_rule_point a ON a.id = b.point_id
+                  LEFT JOIN core_safecheck_plan c ON b.plan_id = c.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_safety_task_data rd ON rd.point_id = b.point_id and rd.task_id = #{taskId}
+         WHERE c.id = #{planId}
+           and a.deleted = 0)
+        union
+        (SELECT f.id                      as areaId,
+                f.name                    as areaName,
+                e.id                      as itemId,
+                e.name                    as itemName,
+                rd.id                     as pointDataId,
+                a.id                      as pointId,
+                a.name                    as pointName,
+                1                         as mustCheck,
+                rd.is_add                 as isAdd,
+                rd.value                  as status,
+                rd.remark                 as remark,
+                rd.rectification_deadline as rectificationDeadline,
+                rd.submit_by,
+                rd.submit_time
+         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 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="selectNfc" resultType="com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterNfcVo">
@@ -696,10 +715,9 @@
         group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.batch_id
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
-        select t.scan_method, n.area_name, n.collection_area_name,n.img
+        select t.scan_method, n.area_name, n.collection_area_name, n.img
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
         where t.task_id = #{taskId}
-
     </select>
 </mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -232,7 +232,7 @@ public class SysRoleController extends BaseController {
 
     //    @InnerAuth
     @PostMapping("/getNames")
-    public List<IdNameVo> getNames(RoleConditionEto condition) {
+    public List<IdNameVo> getNames(@RequestBody RoleConditionEto condition) {
         List<IdName<Long, String>> r = roleService.selectSimpleRoleAll(condition, null);
         return r.stream().map(i -> new IdNameVo(i.getId(), i.getName(), null)).collect(Collectors.toList());
     }