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

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/domain/CoreEduTrainingTask.java

@@ -60,7 +60,7 @@ public class CoreEduTrainingTask extends BaseEntity {
 
 
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * @see com.xunmei.common.core.enums.edu.EduTrainingType
      * 类型
      */
     @TableField("type")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskEditDto.java

@@ -18,37 +18,13 @@ public class CoreEduTrainingTaskEditDto {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty(value = "教育培训计划Id")
-    private Long planId;
-
-    @ApiModelProperty(value = "机构")
-    private Long orgId;
-
-    @ApiModelProperty(value = "机构名称")
-    private String orgName;
-
-    @ApiModelProperty(value = "学习主题")
-    private String title;
-
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * @see com.xunmei.common.core.enums.edu.EduTrainingType
      * 类型
      */
     @ApiModelProperty(value = "类型")
     private Integer type;
 
-    @ApiModelProperty(value = "类型名称")
-    private String typeText;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "开始日期")
-    private LocalDateTime startDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "截止日期")
-    private LocalDateTime endDate;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private LocalDateTime trainingStartDateTime;
@@ -68,8 +44,6 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "图片")
     private List<String> imageList;
 
-    @ApiModelProperty(value = "附件")
-    private List<String> fileList;
     @ApiModelProperty(value = "提交类型", notes = "1:暂存,2:提交")
     private Integer submitType;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskPageDto.java

@@ -1,7 +1,5 @@
 package com.xunmei.common.core.domain.edu.dto;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,11 +11,6 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class CoreEduTrainingTaskPageDto extends PageRequest {
 
-    @ApiModelProperty(value = "培训机构")
-    private Long orgId;
-
-    @ApiModelProperty(value = "培训机构")
-    private String orgPath;
 
     @ApiModelProperty(value = "学习主题")
     private String title;
@@ -28,19 +21,19 @@ public class CoreEduTrainingTaskPageDto extends PageRequest {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
-    @ApiModelProperty("任务时间范围")
+    @ApiModelProperty(value = "任务时间范围", notes = "web端传递此参数")
     private Date[] range;
 
+
     private Date startTime;
 
     private Date endTime;
 
+    @ApiModelProperty(value = "任务时间范围", notes = "App传递此参数")
+    private Date date;
+
+    @ApiModelProperty(value = "是否是App端查询", notes = "App端查询传递此参数")
+    private Integer isAppSelect;
 
-    public CoreEduTrainingTaskPageDto() {
-        if (ObjectUtil.isNotEmpty(this.range)) {
-            this.startTime = DateUtil.beginOfDay(this.range[0]);
-            this.endTime = DateUtil.endOfDay(this.range[0]);
-        }
-    }
 
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -6,7 +6,7 @@ import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -57,19 +57,19 @@ public class CoreEduTrainingTaskDetailVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务开始日期")
-    private Date startDate;
+    private LocalDateTime startDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务截止日期")
-    private Date endDate;
+    private LocalDateTime endDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
-    private Date trainingStartDateTime;
+    private LocalDateTime trainingStartDateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
-    private Date trainingEndDateTime;
+    private LocalDateTime trainingEndDateTime;
 
     @ApiModelProperty(value = "内容")
     private String content;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -1,13 +1,5 @@
 package com.xunmei.common.core.domain.edu.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,7 +28,7 @@ public class CoreEduTrainingTaskPageVo {
     private String title;
 
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * @see com.xunmei.common.core.enums.edu.EduTrainingType
      * 类型
      */
     @ApiModelProperty(value = "类型")
@@ -60,17 +52,14 @@ public class CoreEduTrainingTaskPageVo {
     @ApiModelProperty(value = "任务计划截止日期")
     private Date endDate;
 
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    @ApiModelProperty(value = "培训时间")
-//    private Date dateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingStartDateTime;
 
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    @ApiModelProperty(value = "培训开始时间")
-//    private Date trainingEndDateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训开始时间")
+    private Date trainingEndDateTime;
 
     /**
      * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
@@ -83,5 +72,9 @@ public class CoreEduTrainingTaskPageVo {
 
     private String taskRoleNameList;
 
-  @ApiModelProperty(value = "pdf下载地址")
-    private String pdfUrl;}
+    @ApiModelProperty(value = "pdf下载地址")
+    private String pdfUrl;
+
+    @ApiModelProperty(value = "签名情况", notes = "已签名人数/总人数")
+    private String signNums;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingType.java

@@ -15,8 +15,8 @@ import java.util.Map;
 public enum EduTrainingType {
 
 
-    AQFFXXJY(0, "安全防范学习教育"),
-    ZBXZHD(1, "治保小组活动");
+    AQFFXXJY(0, "每月安全培训教育"),
+    ZBXZHD(1, "专项安全培训教育");
 
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskMonitorInfoController.java

@@ -1,7 +1,6 @@
 package com.xunmei.core.access.controller;
 
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
@@ -9,7 +8,6 @@ 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;
@@ -38,17 +36,6 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
 
-/*    *//**
-     * 查询调阅任务登记检查情况列表
-     *//*
-    @ApiOperation(value = "查询CoreMonitoringTaskMonitorInfo列表")
-    @RequiresPermissions("system:info:list")
-    @GetMapping("/list")
-    public TableDataInfo<CoreMonitoringTaskMonitorInfo> list(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-        return null;
-    }*/
-
-
     /**
      * 获取调阅任务登记检查情况详细信息
      */
@@ -82,14 +69,4 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
         return toAjax(coreMonitoringTaskMonitorInfoService.updateCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
     }
 
-/*    *//**
-     * 删除调阅任务登记检查情况
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("system:info:remove")
-    @Log(title = "调阅任务登记检查情况", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreMonitoringTaskMonitorInfoService.deleteCoreMonitoringTaskMonitorInfoByIds(ids));
-    }*/
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -1,19 +1,16 @@
 package com.xunmei.core.access.controller;
 
-import java.util.List;
 
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
-import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
+
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
-import com.xunmei.core.access.service.impl.CoreMonitoringTaskRegistrationServiceImpl;
-import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+
 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;
@@ -84,15 +81,5 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
-    /*
-     *//**
-     * 删除【请填写功能名称】
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskRegistration")
-    @RequiresPermissions("system:registration:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreMonitoringTaskRegistrationService.deleteCoreMonitoringTaskRegistrationByIds(ids));
-    }*/
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationMonitorController.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.controller;
 
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import io.swagger.annotations.Api;
@@ -11,7 +10,6 @@ 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;
@@ -33,19 +31,6 @@ import com.xunmei.common.security.annotation.RequiresPermissions;
 public class CoreMonitoringTaskRegistrationMonitorController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
-/*
-*//**
- * 查询调阅任务登记监控列表
- *//*
-@ApiOperation(value = "查询CoreMonitoringTaskRegistrationMonitor列表")
-@RequiresPermissions("system:monitor:list")
-@GetMapping("/list")
-    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> list(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-
-      //  return coreMonitoringTaskRegistrationMonitorService.selectPage( coreMonitoringTaskRegistrationMonitor);
-   return  null;
-    }*/
-
 
 
     /**
@@ -79,15 +64,4 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
         return toAjax(coreMonitoringTaskRegistrationMonitorService.updateCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskRegistrationMonitor));
     }
-/*
-    *//**
-     * 删除调阅任务登记监控
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("system:monitor:remove")
-    @Log(title = "调阅任务登记监控" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(coreMonitoringTaskRegistrationMonitorService.deleteCoreMonitoringTaskRegistrationMonitorByIds(ids));
-    }*/
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -3,6 +3,7 @@ package com.xunmei.core.access.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
@@ -50,8 +51,10 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     @ApiModelProperty(value = "下发类型0自建1下发")
     private Integer createType;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskMonitorInfoService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 
@@ -63,11 +62,5 @@ public interface ICoreMonitoringTaskMonitorInfoService extends IService<CoreMoni
      */
     int deleteCoreMonitoringTaskMonitorInfoById(Long id);
 
-    /**
-     * 查询调阅任务登记检查情况分页数据
-     *
-     * @param coreMonitoringTaskMonitorInfo 查询条件对象
-     * @return Page
-     */
-  //  TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationMonitorService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 
@@ -63,11 +62,4 @@ public interface ICoreMonitoringTaskRegistrationService extends IService<CoreMon
      */
     int deleteCoreMonitoringTaskRegistrationById(Long id);
 
-    /**
-     * 查询【请填写功能名称】分页数据
-     *
-     * @param coreMonitoringTaskRegistration 查询条件对象
-     * @return Page
-     */
-  //  TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskMonitorInfoServiceImpl.java

@@ -12,15 +12,13 @@ import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
-import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
+
 
 
 /**
@@ -36,38 +34,6 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
     @Autowired
     private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
 
-/*    @Override
-    public TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-        //未删除
-        coreMonitoringTaskMonitorInfo.setDeleted(0L);
-        Page<CoreMonitoringTaskMonitorInfo> page;
-        //分页
-        if (coreMonitoringTaskMonitorInfo.getPageNum()!=null&&coreMonitoringTaskMonitorInfo.getPageSize()!=null)
-        {
-            page = new Page<>(coreMonitoringTaskMonitorInfo.getPageNum(), coreMonitoringTaskMonitorInfo.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreMonitoringTaskMonitorInfo> query = new QueryWrapper<>(coreMonitoringTaskMonitorInfo);
-        //下穿
-        if (coreMonitoringTaskMonitorInfo.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskMonitorInfo.getOrgId());
-            //清空前端传递的org_id
-            coreMonitoringTaskMonitorInfo.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (coreMonitoringTaskMonitorInfo.getParams().get("beginTime")!=null&&coreMonitoringTaskMonitorInfo.getParams().get("endTime")!=null){
-            query.between("create_time", coreMonitoringTaskMonitorInfo.getParams().get("beginTime"), coreMonitoringTaskMonitorInfo.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreMonitoringTaskMonitorInfoMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-    }*/
-
 
     /**
      * 查询调阅任务登记检查情况
@@ -140,7 +106,7 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
         coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
-        QueryWrapper queryWrapper=new QueryWrapper();
+        QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper=new QueryWrapper();
         queryWrapper.eq("task_monitor_id",coreMonitoringTaskRegistrationMonitor.getId());
         coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
         int i = 0;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationMonitorServiceImpl.java

@@ -1,10 +1,7 @@
 package com.xunmei.core.access.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 
+import java.util.List;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
@@ -36,39 +33,6 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     @Autowired
     private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
 
-/*    @Override
-    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> selectPage(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-        //未删除
-        coreMonitoringTaskRegistrationMonitor.setDeleted(0L);
-        Page<CoreMonitoringTaskRegistrationMonitor> page;
-        //分页
-        if (coreMonitoringTaskRegistrationMonitor.getPageNum()!=null&&coreMonitoringTaskRegistrationMonitor.getPageSize()!=null)
-        {
-            page = new Page<>(coreMonitoringTaskRegistrationMonitor.getPageNum(), coreMonitoringTaskRegistrationMonitor.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreMonitoringTaskRegistrationMonitor> query = new QueryWrapper<>(coreMonitoringTaskRegistrationMonitor);
-        //下穿
-        if (coreMonitoringTaskRegistrationMonitor.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskRegistrationMonitor.getOrgId());
-            //清空前端传递的org_id
-            coreMonitoringTaskRegistrationMonitor.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime")!=null&&coreMonitoringTaskRegistrationMonitor.getParams().get("endTime")!=null){
-            query.between("create_time", coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime"), coreMonitoringTaskRegistrationMonitor.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreMonitoringTaskRegistrationMonitorMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-    }*/
-
-
     /**
      * 查询调阅任务登记监控
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -16,11 +16,7 @@ import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
-
 import java.util.Arrays;
 import java.util.List;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -1,7 +1,5 @@
 package com.xunmei.core.access.service.impl;
 
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,13 +22,10 @@ import com.xunmei.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
+
 
 /**
  * 监控调阅计划Service业务层处理

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -35,33 +35,30 @@ public class CoreEduTrainingTaskController extends BaseController {
     @Autowired
     private ICoreEduTrainingTaskService coreEduTrainingTaskService;
 
-    /**
-     * 查询教育任务列表
-     */
-    @ApiOperation(value = "查询CoreEduTrainingTask列表")
+
+    @ApiOperation(value = "查询教育任务分页")
     @RequiresPermissions("core:eduTask:list")
     @GetMapping("/list")
     public TableDataInfo<CoreEduTrainingTaskPageVo> list(CoreEduTrainingTaskPageDto coreEduTrainingTask) {
-
-        //return  new TableDataInfo<CoreEduTrainingTaskPageVo>();
         return coreEduTrainingTaskService.selectPage(coreEduTrainingTask);
     }
 
 
-    /**
-     * 获取教育任务详细信息
-     */
-    @ApiOperation(value = "获取CoreEduTrainingTask详细信息")
+    @ApiOperation(value = "App端获取签名情况")
+    @RequiresPermissions("core:eduTask:list")
+    @GetMapping("/signUserList/{id}")
+    public AjaxResult signUserList(@PathVariable Long id) {
+        return success(coreEduTrainingTaskService.signUserList(id));
+    }
+
+    @ApiOperation(value = "获取教育任务详细信息")
     @RequiresPermissions("core:eduTask:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskById(id));
     }
 
-    /**
-     * 新增教育任务
-     */
-    @ApiOperation(value = "新增CoreEduTrainingTask")
+    @ApiOperation(value = "新增教育任务")
     @RequiresPermissions("core:eduTask:add")
     @Log(title = "教育任务", businessType = BusinessType.INSERT)
     @PostMapping
@@ -69,10 +66,7 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.insertCoreEduTrainingTask(coreEduTrainingTask));
     }
 
-    /**
-     * 修改教育任务
-     */
-    @ApiOperation(value = "修改CoreEduTrainingTask")
+    @ApiOperation(value = "任务登记")
     @RequiresPermissions("core:eduTask:edit")
     @Log(title = "教育任务", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -80,24 +74,15 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.updateCoreEduTrainingTask(coreEduTrainingTask));
     }
 
-    /**
-     * 删除教育任务
-     */
-    @ApiOperation(value = "删除CoreEduTrainingTask")
+    @ApiOperation(value = "ApiOperation")
     @RequiresPermissions("core:eduTask:remove")
     @Log(title = "教育任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-
-
         return toAjax(coreEduTrainingTaskService.deleteCoreEduTrainingTaskByIds(ids));
     }
 
-
-    /**
-     * 导出教育任务
-     */
-    @ApiOperation(value = "导出CoreEduTrainingTask")
+    @ApiOperation(value = "导出教育任务")
     @RequiresPermissions("core:eduTask:report")
     @PostMapping("report")
     public AjaxResult report(@RequestBody @Validated CoreEduTrainingTaskReportDto request) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ICoreEduTrainingTaskService.java

@@ -3,6 +3,7 @@ package com.xunmei.core.edu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
@@ -90,4 +91,6 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
     AjaxResult buildEduPdf(Long id);
 
     String buildEduTask(Integer cycle, Date date);
+
+    List<CoreEduTrainingTaskToUser> signUserList(Long taskId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -87,6 +87,22 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     @Override
     public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
+        //如果是web段的查询
+        if (ObjectUtil.isNotEmpty(request.getRange())) {
+            request.setStartTime(DateUtil.beginOfDay(request.getRange()[0]));
+            request.setEndTime(DateUtil.endOfDay(request.getRange()[1]));
+        }
+        //如果是App段的查询
+        if (ObjectUtil.isNotNull(request.getDate())) {
+            // Date date = java.sql.Date.valueOf(request.getDate());
+            request.setStartTime(DateUtil.beginOfMonth(request.getDate()));
+            request.setEndTime(DateUtil.endOfMonth(request.getDate()));
+
+        }
+        if (ObjectUtil.equal(1, request.getIsAppSelect())) {
+            request.setCheckSub(true);
+        }
+        //App 默认下穿
         if (Boolean.TRUE.equals(request.getCheckSub())) {
             SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             request.setOrgPath(org.getPath());
@@ -106,6 +122,11 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                     continue;
                 }
                 record.setTaskRoleNameList(coreEduTrainingTaskToRoles.stream().map(CoreEduTrainingTaskToRole::getRoleName).collect(Collectors.joining(",")));
+
+                List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToUser>()
+                        .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, record.getId()));
+                int signNums = (int) userList.stream().filter(user -> user.getSign() == 1).count();
+                record.setSignNums(signNums + "/" + userList.size());
             }
         }
 
@@ -113,6 +134,11 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         return TableDataInfo.build(pageData);
     }
 
+    @Override
+    public List<CoreEduTrainingTaskToUser> signUserList(Long taskId) {
+        return taskToUserMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToUser>()
+                .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, taskId));
+    }
 
     /**
      * 查询教育任务
@@ -162,6 +188,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
+        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
         BeanUtils.copyProperties(request, coreEduTrainingTask);
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
         coreEduTrainingTask.setImageList(ObjectUtil.isNotEmpty(request.getImageList()) ? JSON.toJSONString(request.getImageList()) : null);
@@ -179,6 +206,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
+
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }
 
@@ -443,6 +471,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         }
         return "创建成功";
     }
+
+
 }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleController.java

@@ -5,9 +5,9 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +34,8 @@ public class AppRuleController  extends BaseController {
     @ApiOperation(value = "查询规范列表")
     @GetMapping("page")
     @RequiresPermissions("resumption:rule")
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        final TableDataInfo appRulePage = appRuleService.getAppRulePage(appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        final TableDataInfo appRulePage = appRuleService.getAppRulePage(query);
         return appRulePage;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionController.java

@@ -142,6 +142,24 @@ public class ResumptionController {
     AjaxResult toTaskDetails( @RequestBody @Valid final TaskDetailsDto request) throws ParseException {
         TaskDetailsVo  detailvo = new TaskDetailsVo();
         List<Map<String,Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
+
+        //nfc总区域数量统计
+        Integer nfcScanN=0;
+        for (Map<String,Object> m :
+                tasktotal) {
+            List<ResumptionNfcVo> nfc= (List<ResumptionNfcVo>) m.get("nfclist");
+            nfcScanN += nfc.size();
+        }
+        detailvo.setNfcScanN(nfcScanN);
+        detailvo.setNfcScanY(0);
+
+        //区域数量统计
+        Integer areaScanN=0;
+        areaScanN = tasktotal.size();
+        detailvo.setAreaScanN(areaScanN);
+        detailvo.setAreaScanY(0);
+
+
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
         SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
 
@@ -149,6 +167,7 @@ public class ResumptionController {
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
         detailvo.setNfcScaning("0");
+
         return AjaxResult.success(detailvo);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -28,15 +28,15 @@ public class AppRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "规范类型id")
+    @ApiModelProperty(value = "履职内容库类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "规范名称")
+    @ApiModelProperty(value = "履职内容库名称")
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "受检机构类型")
+    @ApiModelProperty(value = "履职机构类型")
     @TableField("org_type")
     private String orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.resumption.dto.appRule;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class AppRulePageDto extends PageDto<AppRulePageVo> {
+    @ApiModelProperty(value = "履职内容库名称")
+    private String name;
+
+    @ApiModelProperty(value = "履职内容库类型id")
+    private String type;
+
+    @ApiModelProperty(value = "履职机构类型")
+    private String orgType;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否下穿查询")
+    private Boolean checkSub = false;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRule;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
@@ -26,7 +27,7 @@ import java.util.List;
 @Repository
 public interface AppRuleMapper extends BaseMapper<AppRule> {
 
-    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRule appRule);
+    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRulePageDto appRule);
 
     List<AppRuleGroupVo> getRuleGroupList();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/CoreResumptionDataProtectionMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.xunmei.core.resumption.domain.CoreResumptionDataProtection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.resumption.vo.ResumptionDataProtectionVo;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -28,6 +29,7 @@ public interface CoreResumptionDataProtectionMapper extends BaseMapper<CoreResum
      */
     List<CoreResumptionDataProtection> selectCoreResumptionDataProtectionList(CoreResumptionDataProtection coreResumptionDataProtection);
 
+    List<ResumptionDataProtectionVo> selectProtection(Long orgId);
     /**
      * 新增【请填写功能名称】
      *

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

@@ -7,6 +7,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 
@@ -22,7 +23,7 @@ import java.util.List;
  */
 public interface IAppRuleService extends IService<AppRule> {
 
-    TableDataInfo getAppRulePage(AppRule appRule);
+    TableDataInfo getAppRulePage(AppRulePageDto query);
 
     List<AppRulePageVo> getAllAppRule();
 

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

@@ -6,6 +6,7 @@ import com.xunmei.core.resumption.domain.CoreResumptionDataProtection;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.vo.ResumptionDataProtectionVo;
 
 /**
  * 【请填写功能名称】Service接口
@@ -22,6 +23,7 @@ public interface ICoreResumptionDataProtectionService extends IService<CoreResum
      */
      CoreResumptionDataProtection selectCoreResumptionDataProtectionById(Long id);
 
+    List<ResumptionDataProtectionVo> selectProtection(Long orgId);
     /**
      * 查询【请填写功能名称】列表
      *

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

@@ -47,6 +47,8 @@ public class ResumptionBusiness {
     private AppResumptionDataService appResumptionDataService;
     @Autowired
     private IProtectionService protectionService;
+    @Autowired
+    private ICoreResumptionDataProtectionService coreResumptionDataProtectionService;
 
     public Map<String, Object> tasktotal(ResumptionTaskDto request) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -479,6 +481,7 @@ public class ResumptionBusiness {
         });
         //获取nfc
         List<ResumptionNfcVo> nfclists = appResumptionDataNfcService.findNfcByAreaIdAndOrgId(nfcBindIdList, resumption.getOrgId(), resumption.getPlanId());
+
         //对nfc进行去重
         List<ResumptionNfcVo> nfclist = nfclists.stream().collect(Collectors.collectingAndThen
                 (Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ResumptionNfcVo -> ResumptionNfcVo.getNfccdoe()))), ArrayList::new));
@@ -537,6 +540,7 @@ public class ResumptionBusiness {
             Map<String, Object> area = new HashMap<>();
             area.put("areaid", key.toString());
             area.put("areaname", pointsList.get(0).getAreaname());
+
             List<ResumptionNfcVo> areanfclist = nfclist.stream().filter(r -> r.getAreaId().equals(key)).collect(Collectors.toList());
             if ("0".equals(0)) {
                 if (areanfclist == null || areanfclist.size() == 0) {
@@ -557,7 +561,8 @@ public class ResumptionBusiness {
                     for (ResumptionPointVo r :
                             checkitemlist) {
                         if (r.getBusinessType() == 1) {
-                            r.setProtectionVo(protectionService.findNotAllHour(resumption.getOrgId()));
+                            List<ResumptionDataProtectionVo> list = coreResumptionDataProtectionService.selectProtection(resumption.getOrgId());
+                            r.setProtectionVo(list);
                         }
                     }
                 }
@@ -565,6 +570,7 @@ public class ResumptionBusiness {
                 item.put("itemid", keya);
                 item.put("itemname", checkitemlist.get(0).getItemname());
                 item.put("checkitemlist", checkitemlist);
+
                 checklist.add(item);
             }
             area.put("checklist", checklist);

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

@@ -227,6 +227,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 //
 //            }
         } else {
+            if(app.getRoleList()==null){
+                app.setRoleList(new ArrayList<>());
+            }
             //修改
             QueryWrapper<AppPlan> qw = new QueryWrapper<>();
             qw.lambda().eq(AppPlan::getPlanName, app.getPlanName())
@@ -242,9 +245,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             baseMapper.updateById(plan);
 
             Long id = plan.getId();
-            QueryWrapper<AppPlanToRole> apr = new QueryWrapper<>();
-            apr.lambda().eq(AppPlanToRole::getPlanId, id);
-            appPlanToRoleMapper.delete(apr);
+            if(app.getRoleList().size()>0){
+                QueryWrapper<AppPlanToRole> apr = new QueryWrapper<>();
+                apr.lambda().eq(AppPlanToRole::getPlanId, id);
+                appPlanToRoleMapper.delete(apr);
+            }
+
 
             QueryWrapper<AppPlanToPoint> api = new QueryWrapper<>();
             api.lambda().eq(AppPlanToPoint::getPlanId, id);
@@ -260,6 +266,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             appPlanToExecOrgMapper.delete(ape);
 
             List<Long> roleList = app.getRoleList();
+
+
             AppPlanToRole atr = null;
             for (Long roleId : roleList) {
                 atr = new AppPlanToRole();

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

@@ -9,6 +9,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
@@ -44,9 +45,9 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
     RemoteOrgService remoteOrgService;
 
     @Override
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        Page<AppRulePageVo> page = appRule.<AppRulePageVo>getPage();
-        page = appRuleMapper.selectPageByCondition(page, appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        Page<AppRulePageVo> page = query.getPageDto();
+        page = appRuleMapper.selectPageByCondition(page, query);
 
         return TableDataInfo.success(page);
     }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.xunmei.core.resumption.domain.CoreResumptionDataProtection;
 import com.xunmei.core.resumption.mapper.CoreResumptionDataProtectionMapper;
 import com.xunmei.core.resumption.service.ICoreResumptionDataProtectionService;
+import com.xunmei.core.resumption.vo.ResumptionDataProtectionVo;
 import com.xunmei.system.api.RemoteOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,6 +75,11 @@ public class CoreResumptionDataProtectionServiceImpl extends ServiceImpl<CoreRes
         return coreResumptionDataProtectionMapper.selectById(id);
     }
 
+    @Override
+    public List<ResumptionDataProtectionVo> selectProtection(Long orgId) {
+        return baseMapper.selectProtection(orgId);
+    }
+
     /**
      * 查询【请填写功能名称】列表
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ResumptionDataProtectionVo.java

@@ -0,0 +1,11 @@
+package com.xunmei.core.resumption.vo;
+
+import com.xunmei.core.resumption.domain.Protection;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class ResumptionDataProtectionVo extends Protection {
+    private String protectionStatus;
+    private Date protectionTime;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ResumptionNfcVo.java

@@ -26,5 +26,9 @@ public class ResumptionNfcVo {
     private Long areaId;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long nfcid;
+    private Long nfcScanStatus;
+    private Long scanMethod;
+    private String img;
+
 }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ResumptionPointVo.java

@@ -8,6 +8,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -30,7 +31,7 @@ public class ResumptionPointVo {
     private int pointnum;
     private int pointScan;
 
-    private List<Protection> protectionVo;
+    private List<ResumptionDataProtectionVo> protectionVo;
 
     private  int required;
     private Long planId;
@@ -38,8 +39,11 @@ public class ResumptionPointVo {
     private Long pointdataid;
     private String resTime;
     private Integer businessType;
+    private Integer submitBy;
     private String resremark;
+    private Date submitTime;
     private List<ResumptionNfcVo> pointnfclist;
+    private String rectificationDeadline;
 
 }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/TaskDetailsVo.java

@@ -18,7 +18,11 @@ import java.util.Map;
 @Builder
 public class TaskDetailsVo {
     @ApiModelProperty("任务统计及列表")
-    private List<Map<String,Object>> taskarealist;
+    private List<Map<String, Object>> taskarealist;
     private ResumptionTaskListVo taskObj;
     private String nfcScaning;
+    private Integer nfcScanY;
+    private Integer nfcScanN;
+    private Integer areaScanY;
+    private Integer areaScanN;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -38,6 +38,7 @@
         <if test="request.startTime!=null and request.endTime!=null">
             and a.status_update_time >= #{request.startTime} and  a.status_update_time&lt;=#{request.endTime}
         </if>
+        order by id desc
     </select>
 <!--    <select id="pageLog" resultType="com.xunmei.core.resumption.vo.protection.ProtectionLogPageVo">-->
 <!--        select a.id, a.name as name,a.status as status,a.status_update_time,a.status_updator_name-->

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -83,7 +83,7 @@
         <!--            </if>-->
         <!--        </where>-->
         select t.id, plan_id, t.org_id, t.org_name, title, type, status, host_id,u.name as hostName,
-        start_date, end_date, training_start_date_time,training_end_date_time
+        start_date, end_date, t.training_start_date_time,t.training_end_date_time
         from core_edu_training_task t left join sys_user u on t.host_id=u.id
         <where>
             <choose>
@@ -104,10 +104,10 @@
                 and t.status=#{request.status}
             </if>
             <if test="request.startTime != null">
-                and t.date_time >=#{request.startTime}
+                and t.start_date >=#{request.startTime}
             </if>
             <if test="request.endTime != null">
-                and t.date_time <![CDATA[<=]]> #{request.endTime}
+                and t.end_date <![CDATA[<=]]> #{request.endTime}
             </if>
         </where>
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppResumptionDataNfcMapper.xml

@@ -52,13 +52,17 @@
         a.CODE AS nfccdoe,
         d.id AS pointId,
         a.area_id AS areaId,
-        a.id AS nfcid
+        a.id AS nfcid,
+        dnf.STATUS as nfc_scan_status,
+        dnf.scan_method,
+        dnf.img
         FROM
         sys_nfc_bind a
         LEFT JOIN sys_area_check c ON a.check_id = c.id
         LEFT JOIN core_resumption_rule_point d ON a.area_id = d.area_id
         LEFT JOIN core_resumption_plan_to_point e ON e.point_id = d.id
-        WHERE
+        LEFT JOIN core_resumption_data_nfc dnf ON dnf.nfc_id = a.id
+        where
         a.org_id = #{orgId}
 
         AND e.plan_id = #{planId}

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -198,23 +198,28 @@
     <select id="findPointByRulePlan" resultType="com.xunmei.core.resumption.vo.ResumptionPointVo">
         SELECT
             a.id AS pointid,
-            a.name AS pointname,
---             a.point_num AS pointnum,
+            a.NAME AS pointname,--             a.point_num AS pointnum,
             a.item_id AS itemid,
             a.area_id AS areaid,
-            f.name AS areaname,
---             a.time_type AS timeType,
+            f.NAME AS areaname,--             a.time_type AS timeType,
             b.plan_id AS planId,
-            e.name AS itemname,
+            e.NAME AS itemname,
             b.point_scan AS pointScan,
             b.required,
-            a.business_type AS businessType
+            a.business_type AS businessType,
+            rd.res_value,
+            rd.res_time,
+            rd.submit_time,
+            rd.res_status,
+            rd.res_remark,
+            rd.submit_by
         FROM
             core_resumption_rule_point a
                 LEFT JOIN core_resumption_plan_to_point b ON a.id = b.point_id
                 LEFT JOIN core_resumption_plan c ON b.plan_id = c.id
                 LEFT JOIN core_resumption_rule_item e ON a.item_id = e.id
                 LEFT JOIN sys_area f ON a.area_id = f.id
+                LEFT JOIN core_resumption_data rd ON rd.item_id = a.item_id
         WHERE
             c.id = #{planId} and a.deleted=0
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/CoreResumptionDataProtectionMapper.xml

@@ -4,13 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.CoreResumptionDataProtectionMapper">
 
-    <resultMap type="com.xunmei.core.resumption.domain.CoreResumptionDataProtection" id="CoreResumptionDataProtectionResult">
-                <result property="id" column="id"/>
-                <result property="resumptionDataId" column="resumption_data_id"/>
-                <result property="resumptionId" column="resumption_id"/>
-                <result property="protectionId" column="protection_id"/>
-                <result property="protectionStatus" column="protection_status"/>
-                <result property="protectionTime" column="protection_time"/>
+    <resultMap type="com.xunmei.core.resumption.domain.CoreResumptionDataProtection"
+               id="CoreResumptionDataProtectionResult">
+        <result property="id" column="id"/>
+        <result property="resumptionDataId" column="resumption_data_id"/>
+        <result property="resumptionId" column="resumption_id"/>
+        <result property="protectionId" column="protection_id"/>
+        <result property="protectionStatus" column="protection_status"/>
+        <result property="protectionTime" column="protection_time"/>
     </resultMap>
 
     <sql id="selectCoreResumptionDataProtectionVo">
@@ -18,91 +19,105 @@
         from core_resumption_data_protection
     </sql>
 
-    <select id="selectCoreResumptionDataProtectionList" parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection"
+    <select id="selectCoreResumptionDataProtectionList"
+            parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection"
             resultMap="CoreResumptionDataProtectionResult">
         <include refid="selectCoreResumptionDataProtectionVo"/>
         <where>
-                        <if test="resumptionDataId != null ">
-                            and resumption_data_id = #{resumptionDataId}
-                        </if>
-                        <if test="resumptionId != null ">
-                            and resumption_id = #{resumptionId}
-                        </if>
-                        <if test="protectionId != null ">
-                            and protection_id = #{protectionId}
-                        </if>
-                        <if test="protectionStatus != null  and protectionStatus != ''">
-                            and protection_status = #{protectionStatus}
-                        </if>
-                        <if test="protectionTime != null ">
-                            and protection_time = #{protectionTime}
-                        </if>
+            <if test="resumptionDataId != null ">
+                and resumption_data_id = #{resumptionDataId}
+            </if>
+            <if test="resumptionId != null ">
+                and resumption_id = #{resumptionId}
+            </if>
+            <if test="protectionId != null ">
+                and protection_id = #{protectionId}
+            </if>
+            <if test="protectionStatus != null  and protectionStatus != ''">
+                and protection_status = #{protectionStatus}
+            </if>
+            <if test="protectionTime != null ">
+                and protection_time = #{protectionTime}
+            </if>
         </where>
     </select>
 
     <select id="selectCoreResumptionDataProtectionById" parameterType="Long"
             resultMap="CoreResumptionDataProtectionResult">
-            <include refid="selectCoreResumptionDataProtectionVo"/>
-            where id = #{id}
+        <include refid="selectCoreResumptionDataProtectionVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectProtection" resultType="com.xunmei.core.resumption.vo.ResumptionDataProtectionVo">
+        SELECT cp.*,
+               dp.protection_status,
+               dp.protection_time
+        FROM core_protection cp
+                 LEFT JOIN core_resumption_data_protection dp ON cp.id = dp.protection_id
+        where cp.org_id = #{orgId}
+          and deleted = 0
+          and all_Hour = 0
     </select>
 
-    <insert id="insertCoreResumptionDataProtection" parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection">
+    <insert id="insertCoreResumptionDataProtection"
+            parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection">
         insert into core_resumption_data_protection
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="resumptionDataId != null">resumption_data_id,
-                    </if>
-                    <if test="resumptionId != null">resumption_id,
-                    </if>
-                    <if test="protectionId != null">protection_id,
-                    </if>
-                    <if test="protectionStatus != null">protection_status,
-                    </if>
-                    <if test="protectionTime != null">protection_time,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="resumptionDataId != null">resumption_data_id,
+            </if>
+            <if test="resumptionId != null">resumption_id,
+            </if>
+            <if test="protectionId != null">protection_id,
+            </if>
+            <if test="protectionStatus != null">protection_status,
+            </if>
+            <if test="protectionTime != null">protection_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="resumptionDataId != null">#{resumptionDataId},
-                    </if>
-                    <if test="resumptionId != null">#{resumptionId},
-                    </if>
-                    <if test="protectionId != null">#{protectionId},
-                    </if>
-                    <if test="protectionStatus != null">#{protectionStatus},
-                    </if>
-                    <if test="protectionTime != null">#{protectionTime},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="resumptionDataId != null">#{resumptionDataId},
+            </if>
+            <if test="resumptionId != null">#{resumptionId},
+            </if>
+            <if test="protectionId != null">#{protectionId},
+            </if>
+            <if test="protectionStatus != null">#{protectionStatus},
+            </if>
+            <if test="protectionTime != null">#{protectionTime},
+            </if>
         </trim>
     </insert>
 
-    <update id="updateCoreResumptionDataProtection" parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection">
+    <update id="updateCoreResumptionDataProtection"
+            parameterType="com.xunmei.core.resumption.domain.CoreResumptionDataProtection">
         update core_resumption_data_protection
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="resumptionDataId != null">resumption_data_id =
-                        #{resumptionDataId},
-                    </if>
-                    <if test="resumptionId != null">resumption_id =
-                        #{resumptionId},
-                    </if>
-                    <if test="protectionId != null">protection_id =
-                        #{protectionId},
-                    </if>
-                    <if test="protectionStatus != null">protection_status =
-                        #{protectionStatus},
-                    </if>
-                    <if test="protectionTime != null">protection_time =
-                        #{protectionTime},
-                    </if>
+            <if test="resumptionDataId != null">resumption_data_id =
+                #{resumptionDataId},
+            </if>
+            <if test="resumptionId != null">resumption_id =
+                #{resumptionId},
+            </if>
+            <if test="protectionId != null">protection_id =
+                #{protectionId},
+            </if>
+            <if test="protectionStatus != null">protection_status =
+                #{protectionStatus},
+            </if>
+            <if test="protectionTime != null">protection_time =
+                #{protectionTime},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteCoreResumptionDataProtectionById" parameterType="Long">
         delete
-        from core_resumption_data_protection where id = #{id}
+        from core_resumption_data_protection
+        where id = #{id}
     </delete>
 
     <delete id="deleteCoreResumptionDataProtectionByIds" parameterType="String">