调整履职登记

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

@@ -5,7 +5,6 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.resumption.domain.AppPlan;
-import com.xunmei.core.resumption.domain.AppPlanToItem;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
@@ -45,6 +44,7 @@ public class ApiPlanController {
      */
     @PostMapping("/find")
     public AjaxResult hostList(@RequestBody AppPlanVo info){
+
         Page<AppPlan> result = appPlanService.selectPage(info);
         return AjaxResult.success(result);
     }

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.resumption.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.constant.SystemParameterConstant;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -12,9 +13,7 @@ import com.xunmei.core.resumption.dto.ResumptionTaskDto;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.service.ResumptionBusiness;
 import com.xunmei.core.resumption.service.ResumptionService;
-import com.xunmei.core.resumption.vo.ResumptionTaskListVo;
-import com.xunmei.core.resumption.vo.ResumptionTaskVo;
-import com.xunmei.core.resumption.vo.TaskDetailsVo;
+import com.xunmei.core.resumption.vo.*;
 import com.xunmei.system.api.RemoteConfigService;
 import com.xunmei.system.api.domain.SysConfig;
 import io.swagger.annotations.ApiOperation;
@@ -31,7 +30,9 @@ import java.time.Duration;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+
 @RestController
 @RequestMapping("/api/resumption")
 public class ResumptionController {
@@ -42,30 +43,99 @@ public class ResumptionController {
     @Autowired
     ResumptionService resumptionService;
 
+
+
     @ApiOperation(value = "所有")
     @PostMapping(value = "/taskList")
     AjaxResult taskList(@RequestBody @Valid final ResumptionTaskDto request) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if(request.getDateTime()==null){
+        if (request.getDateTime() == null) {
             request.setDateTime(sdf.format(new Date()));
         }
         ResumptionTaskVo taskvo = new ResumptionTaskVo();
-        Map<String,Object> tasktotal = resumptionBusiness.tasktotal(request);
+        Map<String, Object> tasktotal = resumptionBusiness.tasktotal(request);
         taskvo.setTasktotal(tasktotal);
         return AjaxResult.success(taskvo);
     }
 
+    @ApiOperation(value = "new所有")
+    @PostMapping(value = "/newTaskList")
+    AjaxResult newTaskList(@RequestBody ResumptionTaskNewDto request) throws ParseException {
+        if (request.getDateTime() == null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = new Date();
+            String str = sdf.format(date);
+            Date newDate = sdf.parse(str);
+            request.setDateTime(newDate);
+        }
+        //初始化返回对象
+        ResumptionAppRetVo all = new ResumptionAppRetVo();
+        all.setDay(new HashMap<>());
+        all.setNoDay(new HashMap<>());
+        //待完成
+        all.getDay().put("1", new ArrayList<>());
+        //未完成
+        all.getDay().put("2", new ArrayList<>());
+        //已完成
+        all.getDay().put("3", new ArrayList<>());
+        all.getNoDay().put("1", new ArrayList<>());
+        all.getNoDay().put("2", new ArrayList<>());
+        all.getNoDay().put("3", new ArrayList<>());
+        //获取履职数据
+        List<ResumptionAppVo> resumptionApp = resumptionService.findResumptionApp(request);
+        //封装对象
+        for (ResumptionAppVo r :
+                resumptionApp) {
+
+            if (r.getPlanCycle() == 2) {
+                //当前时间等于开始时间
+                if (request.getDateTime().compareTo(r.getPlanStartTime()) == 0) {
+                    //未开始和进行中视为待完成
+                    if (r.getStatus() == 1 || r.getStatus() == 2) {
+                        all.getDay().get("1").add(r);
+                    }
+                    //完成视为已完成
+                    else if (r.getStatus() == 3) {
+                        all.getDay().get("2").add(r);
+                        //已过期视为未完成
+                    } else if (r.getStatus() == 4) {
+                        all.getDay().get("3").add(r);
+                    }
+                }
+
+            } else {
+                //未开始和进行中视为待完成
+                if (r.getStatus() == 1 || r.getStatus() == 2) {
+                    all.getNoDay().get("1").add(r);
+                }
+                //完成视为已完成
+                else if (r.getStatus() == 3) {
+                    all.getNoDay().get("2").add(r);
+                    //已过期视为未完成
+                } else if (r.getStatus() == 4) {
+                    all.getNoDay().get("3").add(r);
+                }
+            }
+        }
+        return AjaxResult.success(all);
+    }
+
     @ApiOperation(value = "详情")
     @PostMapping(value = "/taskDetails")
-    AjaxResult taskDetails( @RequestBody @Valid TaskDetailsDto request) throws ParseException {
+    AjaxResult taskDetails(@RequestBody @Valid TaskDetailsDto request) throws ParseException {
         System.out.println(JSON.toJSONString(request));
         TaskDetailsVo  detailvo = new TaskDetailsVo();
         List<Map<String,Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
         SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
+        TaskDetailsVo detailvo = new TaskDetailsVo();
+        List<Map<String, Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
+        ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
+//        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
-        detailvo.setNfcScaning(systemParame.getValue());
+        detailvo.setNfcScaning("0");
+//        detailvo.setNfcScaning(systemParame.getValue());
         return AjaxResult.success(detailvo);
     }
 
@@ -76,9 +146,14 @@ public class ResumptionController {
         List<Map<String,Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
         SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
+    AjaxResult toTaskDetails(@RequestBody @Valid final TaskDetailsDto request) throws ParseException {
+        TaskDetailsVo detailvo = new TaskDetailsVo();
+        List<Map<String, Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
+        ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
+//        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
-        detailvo.setNfcScaning(systemParame.getValue());
+        detailvo.setNfcScaning("0");
         return AjaxResult.success(detailvo);
     }
 
@@ -91,7 +166,7 @@ public class ResumptionController {
 
     @ApiOperation(value = "保存履职数据")
     @PostMapping(value = "/submitTaskData")
-    AjaxResult submitTaskData( @RequestBody @Valid final ResumptionTaskDataDto request) throws ParseException {
+    AjaxResult submitTaskData(@RequestBody @Valid final ResumptionTaskDataDto request) throws ParseException {
         //仅当hashKey不存在时才设置
         Boolean isOk = RedisUtils.hasKey("resumption" + request.getTaskid());
         if(!isOk){
@@ -102,24 +177,35 @@ public class ResumptionController {
         if(!isOk){
             throw  new RuntimeException("请勿重复提交");
         }else{
+        boolean flag = redisService.redisTemplate.opsForHash().putIfAbsent("resumption" + request.getTaskid(), request.getTaskid(), request.getTaskid());//redisTemplate.opsForValue().setIfAbsent("resumption"+request.getTaskid(), "resumption"+request.getTaskid());
+        redisService.redisTemplate.expire("resumption" + request.getTaskid(), 1000 * 20, TimeUnit.MILLISECONDS);
+        if (!flag) {
+            throw new RuntimeException("请勿重复提交");
+        } else {
             try {
                 //final Resumption resumption = this.resumptionService.find(request.getTaskid());
                 final Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
-                if(resumption.getStatus().ordinal()==1||resumption.getStatus().ordinal()==2||resumption.getStatus().ordinal()==5){
+                if (resumption.getStatus() == 1 || resumption.getStatus() == 2 || resumption.getStatus() == 5) {
                     //重复提交履职数据，先将之前提交的数据删除，然后在重新保存
                     this.resumptionBusiness.deleteTaskData(resumption);
                 }
-                if(resumption.getStatus().ordinal()==3){
+                if (resumption.getStatus() == 3) {
                     throw new RuntimeException("该任务已过期不能完成提交");
                 }
+                int num = this.resumptionBusiness.submitTaskData(request, SecurityUtils.getLoginUser(), resumption);
+                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
                 int num = this.resumptionBusiness.submitTaskData(request, SecurityUtils.getLoginUser(),resumption);
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
                 return AjaxResult.success(num);
+            } catch (Exception e) {
+                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
             }catch (Exception e){
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
                 return AjaxResult.error(e.getMessage());
+            } finally {
+                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
             }finally {
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToItem.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToPoint.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 
 /**
- * 计划要点关联表(core_resumption_plan_to_item)实体类
+ * 计划要点关联表(core_resumption_plan_to_point)实体类
  *
  * @author 高雄
  * @since 2022-05-05 17:02:28
@@ -18,8 +18,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("core_resumption_plan_to_item")
-public class AppPlanToItem extends Model<AppPlanToItem> implements Serializable {
+@TableName("core_resumption_plan_to_point")
+public class AppPlanToPoint extends Model<AppPlanToPoint> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -29,7 +29,7 @@ public class AppPlanToItem extends Model<AppPlanToItem> implements Serializable
     /**
      * 检查要点id
      */
-    private Long itemId;
+    private Long pointId;
 
     /**
      * 检查要点是否扫描

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

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 履职数据表(t_app_resumption_data)实体类
+ * 履职数据表(core_resumption_data)实体类
  *
  * @author oygj
  * @since 2022-05-05 17:35:14
@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("t_app_resumption_data")
+@TableName("core_resumption_data")
 public class AppResumptionData extends Model<AppResumptionData> implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 履职nfc扫描表(t_app_resumption_data_nfc)实体类
+ * 履职nfc扫描表(core_resumption_data_nfc)实体类
  *
  * @author oygj
  * @since 2022-05-06 08:37:04
@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("t_app_resumption_data_nfc")
+@TableName("core_resumption_data_nfc")
 public class AppResumptionDataNfc extends Model<AppResumptionDataNfc> implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 
 /**
- * 履职产生图片表(t_app_resumption_task_data_remarkimg)实体类
+ * 履职产生图片表(core_resumption_task_data_remarkimg)实体类
  *
  * @author oygj
  * @since 2022-07-06 15:24:56
@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("t_app_resumption_task_data_remarkimg")
+@TableName("core_resumption_task_data_remarkimg")
 public class AppResumptionTaskDataRemarkimg extends Model<AppResumptionTaskDataRemarkimg> implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -39,29 +39,29 @@ public class Resumption extends BaseEntity {
         //
         return Resumption.builder()
                          .id(type.toId(formType, ymd.getDate(), orgId))
-                         .status(status)
+//                         .status(status)
                          .orgId(orgId)
-                         .type(type)
-                         .formType(formType)
+//                         .type(type)
+//                         .formType(formType)
                          .exceptionCount(0)
                          .ymd(ymd)
                          .build();
     }
 
-    public static Resumption newof(final Long orgId, final ResumptionType type, final Ymd ymd, final Long appPlanid,final String id) {
-        // 判断时间是否过期, 如果过期就显示未提交
-        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
-        return Resumption.builder()
-                .id(id)
-                .status(status)
-                .orgId(orgId)
-                .type(type)
-                .exceptionCount(0)
-                .ymd(ymd)
-                .planId(appPlanid)
-                .build()
-               ;
-    }
+//    public static Resumption newof(final Long orgId, final ResumptionType type, final Ymd ymd, final Long appPlanid,final String id) {
+//        // 判断时间是否过期, 如果过期就显示未提交
+//        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
+//        return Resumption.builder()
+//                .id(id)
+////                .status(status)
+//                .orgId(orgId)
+//                .type(type)
+//                .exceptionCount(0)
+//                .ymd(ymd)
+//                .planId(appPlanid)
+//                .build()
+//               ;
+//    }
 
 
     /**
@@ -82,17 +82,17 @@ public class Resumption extends BaseEntity {
     /**
      * 状态
      */
-    private ResumptionStatus status;
+    private Integer status;
 
     /**
      * 履职类型
      */
-    private ResumptionType type;
+    private Integer type;
 
     /**
      * 表单类型
      */
-    private FormType formType;
+//    private FormType formType;
 
     /**
      * 异常数目
@@ -173,26 +173,26 @@ public class Resumption extends BaseEntity {
     /**
      * @return
      */
-    public String summary() {
-        switch (this.type) {
-            case DAY:
-                return String.format("%s-%s-%s %s", this.ymd.getYear(), this.ymd.getMonth(), this.ymd.getDay(), this.formType.getText());
-            case WEEK:
-                return String.format("%s 第%s周 %s", this.ymd.getYear(), this.ymd.getWeek(), this.formType.getText());
-            case MONTH:
-                return String.format("%s-%s %s", this.ymd.getYear(), this.ymd.getMonth(), this.formType.getText());
-            case QUARTER:
-                return String.format("%s 第%s季 %s", this.ymd.getYear(), this.ymd.getQuarter(), this.formType.getText());
-            case HALFYEAR:
-                if(this.ymd.getHalfyear().intValue() == 1){
-                    return String.format("%s 上半年 %s", this.ymd.getYear(), this.formType.getText());
-                }else{
-                    return String.format("%s 下半年 %s", this.ymd.getYear(), this.formType.getText());
-                }
-            default:
-                return String.format("%s 年 %s", this.ymd.getYear(), this.formType.getText());
-        }
-    }
+//    public String summary() {
+//        switch (this.type) {
+//            case DAY:
+//                return String.format("%s-%s-%s %s", this.ymd.getYear(), this.ymd.getMonth(), this.ymd.getDay());
+//            case WEEK:
+//                return String.format("%s 第%s周 %s", this.ymd.getYear(), this.ymd.getWeek());
+//            case MONTH:
+//                return String.format("%s-%s %s", this.ymd.getYear(), this.ymd.getMonth());
+//            case QUARTER:
+//                return String.format("%s 第%s季 %s", this.ymd.getYear(), this.ymd.getQuarter());
+//            case HALFYEAR:
+//                if(this.ymd.getHalfyear().intValue() == 1){
+//                    return String.format("%s 上半年 %s", this.ymd.getYear());
+//                }else{
+//                    return String.format("%s 下半年 %s", this.ymd.getYear());
+//                }
+//            default:
+//                return String.format("%s 年 %s", this.ymd.getYear());
+//        }
+//    }
 
     /**
      * 是否提交
@@ -205,34 +205,34 @@ public class Resumption extends BaseEntity {
      *
      * @param isWork
      */
-    public void changeWork(final Boolean isWork) {
-        final ResumptionStatus old = this.status;
-        // 再次变更, 如果营业
-        if (isWork) {
-            // 过期,除了已提交的都是未提交
-            if (this.type.isExpire(this.ymd)) {
-                switch (this.status) {
-                    case ERROR:
-                    case NORMAL:
-                        break;
-                    default:
-                        this.setStatus(ResumptionStatus.NOT);
-                }
-            }
-            // 未过期, 如果是歇业或者未提交, 那么变成待履职
-            else {
-                switch (this.status) {
-                    case NA:
-                    case NOT:
-                        this.setStatus(ResumptionStatus.WAIT);
-                        break;
-                }
-            }
-        }
-        // 再次变更, 如果歇业
-        else {
-            this.setStatus(ResumptionStatus.NA);
-        }
-//        RESUMPTIONLOG.info("[ {} ]履职旧状态[ {} ] => [ {} ]", this.id, old, this.status);
-    }
+//    public void changeWork(final Boolean isWork) {
+//        final ResumptionStatus old = this.status;
+//        // 再次变更, 如果营业
+//        if (isWork) {
+//            // 过期,除了已提交的都是未提交
+//            if (this.type.isExpire(this.ymd)) {
+//                switch (this.status) {
+//                    case ERROR:
+//                    case NORMAL:
+//                        break;
+//                    default:
+//                        this.setStatus(ResumptionStatus.NOT);
+//                }
+//            }
+//            // 未过期, 如果是歇业或者未提交, 那么变成待履职
+//            else {
+//                switch (this.status) {
+//                    case NA:
+//                    case NOT:
+//                        this.setStatus(ResumptionStatus.WAIT);
+//                        break;
+//                }
+//            }
+//        }
+//        // 再次变更, 如果歇业
+//        else {
+//            this.setStatus(ResumptionStatus.NA);
+//        }
+////        RESUMPTIONLOG.info("[ {} ]履职旧状态[ {} ] => [ {} ]", this.id, old, this.status);
+//    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRulePoint/AppRulePointDetailDto.java

@@ -65,7 +65,7 @@ public class AppRulePointDetailDto {
 //    @ApiModelProperty(value = "风险等级名称")
 //    private String degreeRiskName;
 
-    /*@ApiModelProperty(value = "t_area_check 主键id")
+    /*@ApiModelProperty(value = "sys_area_check 主键id")
     private Long nfcBindId;*/
 
     @ApiModelProperty(value = "要点关联的业务类型")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRulePoint/AppRulePointInfoDto.java

@@ -55,7 +55,7 @@ public class AppRulePointInfoDto {
     @ApiModelProperty(value = "履职计划名称")
     private Long planId;
 
-    @ApiModelProperty(value = "t_area_check 主键id")
+    @ApiModelProperty(value = "sys_area_check 主键id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long nfcBindId;
 

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

@@ -1,7 +1,7 @@
 package com.xunmei.core.resumption.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.core.resumption.domain.AppPlanToItem;
+import com.xunmei.core.resumption.domain.AppPlanToPoint;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
- * 计划要点关联表(core_resumption_plan_to_item)数据Mapper
+ * 计划要点关联表(core_resumption_plan_to_point)数据Mapper
  *
  * @author 高雄
  * @since 2022-05-05 17:02:28
@@ -17,7 +17,7 @@ import java.util.List;
 */
 @Mapper
 @Repository
-public interface AppPlanToItemMapper extends BaseMapper<AppPlanToItem> {
+public interface AppPlanToItemMapper extends BaseMapper<AppPlanToPoint> {
 
     List<Long> selectItemIdsByPlanId(@Param("planId") Long planId);
 }

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

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 履职数据表(t_app_resumption_data)数据Mapper
+ * 履职数据表(core_resumption_data)数据Mapper
  *
  * @author oygj
  * @since 2022-05-05 17:35:14

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

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 履职nfc扫描表(t_app_resumption_data_nfc)数据Mapper
+ * 履职nfc扫描表(core_resumption_data_nfc)数据Mapper
  *
  * @author oygj
  * @since 2022-05-06 08:37:04

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

@@ -5,7 +5,7 @@ import com.xunmei.core.resumption.domain.AppResumptionTaskDataRemarkimg;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 履职产生图片表(t_app_resumption_task_data_remarkimg)数据Mapper
+ * 履职产生图片表(core_resumption_task_data_remarkimg)数据Mapper
  *
  * @author oygj
  * @since 2022-07-06 15:24:56

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

@@ -3,6 +3,9 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.resumption.domain.AppRulePoint;
 import com.xunmei.core.resumption.domain.Resumption;
+import com.xunmei.core.resumption.dto.ResumptionTaskDto;
+import com.xunmei.core.resumption.vo.ResumptionAppVo;
+import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +25,6 @@ public interface ResumptionMapper extends BaseMapper<Resumption> {
     List<Map<String, Object>> findOneByTaskId(@Param("taskId")String taskId,@Param("year")int year,@Param("quarter")int quarter);
 
     void updateResumption(@Param("resumption") Resumption resumption);
+
+    List<ResumptionAppVo> findResumptionApp(@Param("res") ResumptionTaskNewDto res);
 }

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

@@ -25,6 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -42,374 +45,398 @@ public class ResumptionBusiness {
     private IAppRulePointService appRulePointService;
     @Autowired
     private AppResumptionDataService appResumptionDataService;
+
     public Map<String, Object> tasktotal(ResumptionTaskDto request) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         final DateHelper dateTime = new DateHelper(sdf.parse(request.getDateTime()));
-        int year =dateTime.getYear();
+        int year = dateTime.getYear();
         int month = dateTime.getMonth();
         int week = dateTime.getWeek();
-        int quarter =dateTime.getQuarter() ;
-        int halfyear =dateTime.getHalfyear() ;
+        int quarter = dateTime.getQuarter();
+        int halfyear = dateTime.getHalfyear();
         String time = request.getDateTime();
-        Map<String,Object> tasktotal = new HashMap<>();
-        if(request.getTypeCode().equals("day")){//返回每日，没小时的数据
+        Map<String, Object> tasktotal = new HashMap<>();
+        if (request.getTypeCode().equals("day")) {//返回每日，没小时的数据
             //统计数据
-            Map<String,Object> hourtotal = new HashMap<>();
-            Map<String,Object> daytotal = new HashMap<>();
+            Map<String, Object> hourtotal = new HashMap<>();
+            Map<String, Object> daytotal = new HashMap<>();
             //统计每日的所有任务数据
             //List<Resumption> dayList = resumptionService.findListByDay(time,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()));
-            List<Map<String,Object>> dayList = resumptionService.findDayTaskList(year,quarter,time,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()));
+            List<Map<String, Object>> dayList = resumptionService.findDayTaskList(year, quarter, time, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()));
             //List<Map<String,Object>> dayList = objectMapper.findDayTaskList(year,quarter,time,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()));
             //统计每小时的任务数据
-            int hourfinishnum = (int) dayList.stream().filter(r->(int)r.get("type")==6&&((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int  hourundonenum = (int) dayList.stream().filter(r->(int)r.get("type")==6&&(int)r.get("status")==3).count();
-            int  hourwaitenum = (int) dayList.stream().filter(r->(int)r.get("type")==6&&(int)r.get("status")==0).count();
-            int  hourtotalall = (int) dayList.stream().filter(r->(int)r.get("type")==6).count();
-            hourtotal.put("finishnum",hourfinishnum);
-            hourtotal.put("undonenum",hourundonenum);
-            hourtotal.put("waitenum",hourwaitenum);
-            hourtotal.put("tasknum",hourtotalall);
-            tasktotal.put("hourtotal",hourtotal);
+            int hourfinishnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int hourundonenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && (int) r.get("status") == 3).count();
+            int hourwaitenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && (int) r.get("status") == 0).count();
+            int hourtotalall = (int) dayList.stream().filter(r -> (int) r.get("type") == 6).count();
+            hourtotal.put("finishnum", hourfinishnum);
+            hourtotal.put("undonenum", hourundonenum);
+            hourtotal.put("waitenum", hourwaitenum);
+            hourtotal.put("tasknum", hourtotalall);
+            tasktotal.put("hourtotal", hourtotal);
             //统计每日的任务数据
-            int  dayfinishnum = (int) dayList.stream().filter(r->(int)r.get("type")==0&&((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int dayundonenum = (int) dayList.stream().filter(r->(int)r.get("type")==0&&(int)r.get("status")==3).count();
-            int daywaitnum = (int) dayList.stream().filter(r->(int)r.get("type")==0&&(int)r.get("status")==0).count();
-            int daytotalall = (int) dayList.stream().filter(r->(int)r.get("type")==0).count();
-            daytotal.put("finishnum",dayfinishnum);
-            daytotal.put("undonenum",dayundonenum);
-            daytotal.put("waitenum",daywaitnum);
-            daytotal.put("tasknum",daytotalall);
-            tasktotal.put("daytotal",daytotal);
-
-            List<Map<String,Object>> hourlistMap = dayList.stream().filter(r->(int)r.get("type")==6).collect(Collectors.toList());
-            List<ResumptionTaskListVo> hourlist = taskListVo(hourlistMap,6);
-            tasktotal.put("hourlist",hourlist);
-            List<Map<String,Object>> daylistMap = dayList.stream().filter(r->(int)r.get("type")==0).collect(Collectors.toList());
-            List<ResumptionTaskListVo> daylist = taskListVo(daylistMap,0);
-            tasktotal.put("daylist",daylist);
+            int dayfinishnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int dayundonenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && (int) r.get("status") == 3).count();
+            int daywaitnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && (int) r.get("status") == 0).count();
+            int daytotalall = (int) dayList.stream().filter(r -> (int) r.get("type") == 0).count();
+            daytotal.put("finishnum", dayfinishnum);
+            daytotal.put("undonenum", dayundonenum);
+            daytotal.put("waitenum", daywaitnum);
+            daytotal.put("tasknum", daytotalall);
+            tasktotal.put("daytotal", daytotal);
+
+            List<Map<String, Object>> hourlistMap = dayList.stream().filter(r -> (int) r.get("type") == 6).collect(Collectors.toList());
+            List<ResumptionTaskListVo> hourlist = taskListVo(hourlistMap, 6);
+            tasktotal.put("hourlist", hourlist);
+            List<Map<String, Object>> daylistMap = dayList.stream().filter(r -> (int) r.get("type") == 0).collect(Collectors.toList());
+            List<ResumptionTaskListVo> daylist = taskListVo(daylistMap, 0);
+            tasktotal.put("daylist", daylist);
             //获取任务列表
-        }if(request.getTypeCode().equals("month")){//返回没月，每周的数据
+        }
+        if (request.getTypeCode().equals("month")) {//返回没月，每周的数据
             //统计数据
-            Map<String,Object> weektotal = new HashMap<>();
-            Map<String,Object> monthtotal = new HashMap<>();
+            Map<String, Object> weektotal = new HashMap<>();
+            Map<String, Object> monthtotal = new HashMap<>();
             //统计每周的任务数据
-            List<Map<String,Object>> weekList =resumptionService.findMonthTaskList(year,month,1,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()),quarter);
+            List<Map<String, Object>> weekList = resumptionService.findMonthTaskList(year, month, 1, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
             //统计每月的任务数据
-            List<Map<String,Object>> monthList = resumptionService.findMonthTaskList(year,month,2,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()),quarter);
-            int weekfinishnum =(int) weekList.stream().filter(r->((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int weekundonenum =(int) weekList.stream().filter(r->(int)r.get("status")==3).count();
-            int weekwaitnum =(int) weekList.stream().filter(r->(int)r.get("status")==0).count();
-            int weektotall =weekList.size();
-            weektotal.put("finishnum",weekfinishnum);
-            weektotal.put("undonenum",weekundonenum);
-            weektotal.put("waitenum",weekwaitnum);
-            weektotal.put("tasknum",weektotall);
-            tasktotal.put("weektotal",weektotal);
-            int monthfinishnum =(int) monthList.stream().filter(r->((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int monthundonenum =(int) monthList.stream().filter(r->(int)r.get("status")==3).count();
-            int monthwaitnum =(int) monthList.stream().filter(r->(int)r.get("status")==0).count();
-            int monthtotall =monthList.size();
-            monthtotal.put("finishnum",monthfinishnum);
-            monthtotal.put("undonenum",monthundonenum);
-            monthtotal.put("waitenum",monthwaitnum);
-            monthtotal.put("tasknum",monthtotall);
-            tasktotal.put("monthtotal",monthtotal);
-            List<ResumptionTaskListVo> weeklist = taskListVo(weekList,1);
-            List<ResumptionTaskListVo> monthlist = taskListVo(monthList,2);
-            tasktotal.put("weeklist",weeklist);
-            tasktotal.put("monthlist",monthlist);
+            List<Map<String, Object>> monthList = resumptionService.findMonthTaskList(year, month, 2, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
+            int weekfinishnum = (int) weekList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int weekundonenum = (int) weekList.stream().filter(r -> (int) r.get("status") == 3).count();
+            int weekwaitnum = (int) weekList.stream().filter(r -> (int) r.get("status") == 0).count();
+            int weektotall = weekList.size();
+            weektotal.put("finishnum", weekfinishnum);
+            weektotal.put("undonenum", weekundonenum);
+            weektotal.put("waitenum", weekwaitnum);
+            weektotal.put("tasknum", weektotall);
+            tasktotal.put("weektotal", weektotal);
+            int monthfinishnum = (int) monthList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int monthundonenum = (int) monthList.stream().filter(r -> (int) r.get("status") == 3).count();
+            int monthwaitnum = (int) monthList.stream().filter(r -> (int) r.get("status") == 0).count();
+            int monthtotall = monthList.size();
+            monthtotal.put("finishnum", monthfinishnum);
+            monthtotal.put("undonenum", monthundonenum);
+            monthtotal.put("waitenum", monthwaitnum);
+            monthtotal.put("tasknum", monthtotall);
+            tasktotal.put("monthtotal", monthtotal);
+            List<ResumptionTaskListVo> weeklist = taskListVo(weekList, 1);
+            List<ResumptionTaskListVo> monthlist = taskListVo(monthList, 2);
+            tasktotal.put("weeklist", weeklist);
+            tasktotal.put("monthlist", monthlist);
             //获取任务列表
 
-        }if(request.getTypeCode().equals("year")){//返回每季度，每半年，和每年的数据
+        }
+        if (request.getTypeCode().equals("year")) {//返回每季度，每半年，和每年的数据
             //统计数据
-            Map<String,Object> quartertotal = new HashMap<>();
-            Map<String,Object> halfyeartotal = new HashMap<>();
-            Map<String,Object> yeartotal = new HashMap<>();
+            Map<String, Object> quartertotal = new HashMap<>();
+            Map<String, Object> halfyeartotal = new HashMap<>();
+            Map<String, Object> yeartotal = new HashMap<>();
             //统计每季度的任务数据
-            List<Map<String,Object>> quarterList = resumptionService.findYearTaskList(year,3,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()),quarter);
-            List<Map<String,Object>> halfyearList = resumptionService.findYearTaskList(year,4,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()),quarter);
-            List<Map<String,Object>> yearList = resumptionService.findYearTaskList(year,5,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()),1);
-            int quarterfinishnum =(int) quarterList.stream().filter(r->((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int quarterundonenum =(int) quarterList.stream().filter(r->(int)r.get("status")==3).count();
-            int quarterwaitnum =(int) quarterList.stream().filter(r->(int)r.get("status")==0).count();
-            int quartertotall =quarterList.size();
-            quartertotal.put("finishnum",quarterfinishnum);
-            quartertotal.put("undonenum",quarterundonenum);
-            quartertotal.put("waitenum",quarterwaitnum);
-            quartertotal.put("tasknum",quartertotall);
-            tasktotal.put("quartertotal",quartertotal);
+            List<Map<String, Object>> quarterList = resumptionService.findYearTaskList(year, 3, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
+            List<Map<String, Object>> halfyearList = resumptionService.findYearTaskList(year, 4, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
+            List<Map<String, Object>> yearList = resumptionService.findYearTaskList(year, 5, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), 1);
+            int quarterfinishnum = (int) quarterList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int quarterundonenum = (int) quarterList.stream().filter(r -> (int) r.get("status") == 3).count();
+            int quarterwaitnum = (int) quarterList.stream().filter(r -> (int) r.get("status") == 0).count();
+            int quartertotall = quarterList.size();
+            quartertotal.put("finishnum", quarterfinishnum);
+            quartertotal.put("undonenum", quarterundonenum);
+            quartertotal.put("waitenum", quarterwaitnum);
+            quartertotal.put("tasknum", quartertotall);
+            tasktotal.put("quartertotal", quartertotal);
             //统计每半年的任务数据
-            int halfyearfinishnum =(int) halfyearList.stream().filter(r->((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int halfyearundonenum =(int) halfyearList.stream().filter(r->(int)r.get("status")==3).count();
-            int halfyearwaitnum =(int) halfyearList.stream().filter(r->(int)r.get("status")==0).count();
-            int halfyeartotalall =halfyearList.size();
-            halfyeartotal.put("finishnum",halfyearfinishnum);
-            halfyeartotal.put("undonenum",halfyearundonenum);
-            halfyeartotal.put("waitenum",halfyearwaitnum);
-            halfyeartotal.put("tasknum",halfyeartotalall);
-            tasktotal.put("halfyeartotal",halfyeartotal);
+            int halfyearfinishnum = (int) halfyearList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int halfyearundonenum = (int) halfyearList.stream().filter(r -> (int) r.get("status") == 3).count();
+            int halfyearwaitnum = (int) halfyearList.stream().filter(r -> (int) r.get("status") == 0).count();
+            int halfyeartotalall = halfyearList.size();
+            halfyeartotal.put("finishnum", halfyearfinishnum);
+            halfyeartotal.put("undonenum", halfyearundonenum);
+            halfyeartotal.put("waitenum", halfyearwaitnum);
+            halfyeartotal.put("tasknum", halfyeartotalall);
+            tasktotal.put("halfyeartotal", halfyeartotal);
             //统计每年的任务数据
-            int yearfinishnum =(int) yearList.stream().filter(r->((int)r.get("status")==1||(int)r.get("status")==2||(int)r.get("status")==5)).count();
-            int yearundonenum =(int) yearList.stream().filter(r->(int)r.get("status")==3).count();
-            int yearwaitnum =(int) yearList.stream().filter(r->(int)r.get("status")==0).count();
-            int yeartotalall =yearList.size();
-            yeartotal.put("finishnum",yearfinishnum);
-            yeartotal.put("undonenum",yearundonenum);
-            yeartotal.put("waitenum",yearwaitnum);
-            yeartotal.put("tasknum",yeartotalall);
-            tasktotal.put("yeartotal",yeartotal);
+            int yearfinishnum = (int) yearList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
+            int yearundonenum = (int) yearList.stream().filter(r -> (int) r.get("status") == 3).count();
+            int yearwaitnum = (int) yearList.stream().filter(r -> (int) r.get("status") == 0).count();
+            int yeartotalall = yearList.size();
+            yeartotal.put("finishnum", yearfinishnum);
+            yeartotal.put("undonenum", yearundonenum);
+            yeartotal.put("waitenum", yearwaitnum);
+            yeartotal.put("tasknum", yeartotalall);
+            tasktotal.put("yeartotal", yeartotal);
 
-            List<ResumptionTaskListVo> quarterlist = taskListVo(quarterList,3);
-            List<ResumptionTaskListVo> halfyearlist = taskListVo(halfyearList,4);
-            List<ResumptionTaskListVo> yearlist = taskListVo(yearList,5);
+            List<ResumptionTaskListVo> quarterlist = taskListVo(quarterList, 3);
+            List<ResumptionTaskListVo> halfyearlist = taskListVo(halfyearList, 4);
+            List<ResumptionTaskListVo> yearlist = taskListVo(yearList, 5);
 
-            tasktotal.put("quarterlist",quarterlist);
-            tasktotal.put("halfyearlist",halfyearlist);
-            tasktotal.put("yearlist",yearlist);
+            tasktotal.put("quarterlist", quarterlist);
+            tasktotal.put("halfyearlist", halfyearlist);
+            tasktotal.put("yearlist", yearlist);
 
 
         }
         return tasktotal;
     }
-    public List<ResumptionTaskListVo> taskListVo(List<Map<String,Object>> list,int type) throws ParseException {
+public Date LocalDateTimeToDate(LocalDateTime localDateTime){
+//    LocalDateTime localDateTime = LocalDateTime.now();
+    ZoneId zoneId = ZoneId.systemDefault();
+    ZonedDateTime zdt = localDateTime.atZone(zoneId);
+    Date date = Date.from(zdt.toInstant());
+    return date;
+}
+    public List<ResumptionTaskListVo> taskListVo(List<Map<String, Object>> list, int type) throws ParseException {
         List<ResumptionTaskListVo> listVos = new ArrayList<>();
-        List<Map<String,Object>> taskarealist = new ArrayList<>();
+        List<Map<String, Object>> taskarealist = new ArrayList<>();
         SimpleDateFormat sdft = new SimpleDateFormat("HH:mm:ss");
         sdft.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         SimpleDateFormat sdfta = new SimpleDateFormat("yyyy-MM-dd");
         sdfta.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         SimpleDateFormat sdftb = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdftb.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-        if(type==6){//处理每小时的数据
-            for(Map map:list){
+        if (type == 6) {//处理每小时的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdft.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdft.format((Date) map.get("planendtime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdft.format(LocalDateTimeToDate((LocalDateTime) map.get("planstarttime"))));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdft.format((Date) map.get("planendtime")));
                 vo.setTitle(map.get("title").toString());
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
-        } if(type==0){//处理每日的数据
+        }
+        if (type == 0) {//处理每日的数据
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-            for(Map map:list){
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdft.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdft.format((Date) map.get("planendtime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdft.format(LocalDateTimeToDate((LocalDateTime) map.get("planstarttime"))));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdft.format(LocalDateTimeToDate((LocalDateTime)  map.get("planendtime"))));
                 vo.setTitle(map.get("title").toString());
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format(LocalDateTimeToDate((LocalDateTime)   map.get("submitTime"))));
                 listVos.add(vo);
             }
 
-        } if(type==1){//处理每周的数据
-            for(Map map:list){
+        }
+        if (type == 1) {//处理每周的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdfta.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdfta.format((Date) map.get("planendtime")));
-                vo.setTitle(map.get("ymd_year")+"年第"+map.get("ymd_week")+"周-"+map.get("title"));
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdfta.format((Date) map.get("planstarttime")));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdfta.format((Date) map.get("planendtime")));
+                vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_week") + "周-" + map.get("title"));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
 
-        } if(type==2){//处理每月的数据
-            for(Map map:list){
+        }
+        if (type == 2) {//处理每月的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdfta.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdfta.format((Date) map.get("planendtime")));
-                vo.setTitle(map.get("ymd_year")+"年第"+map.get("ymd_month")+"月-"+map.get("title"));
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdfta.format((Date) map.get("planstarttime")));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdfta.format((Date) map.get("planendtime")));
+                vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_month") + "月-" + map.get("title"));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
 
-        } if(type==3){//处理每季度的数据
-            for(Map map:list){
+        }
+        if (type == 3) {//处理每季度的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdfta.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdfta.format( (Date) map.get("planendtime")));
-                vo.setTitle(map.get("ymd_year")+"年第"+map.get("ymd_quarter")+"季度-"+map.get("title"));
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdfta.format((Date) map.get("planstarttime")));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdfta.format((Date) map.get("planendtime")));
+                vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_quarter") + "季度-" + map.get("title"));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
 
-        } if(type==4){//处理每半年的数据
-            for(Map map:list){
+        }
+        if (type == 4) {//处理每半年的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdfta.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime(map.get("planendtime")==null?"":sdfta.format((Date) map.get("planendtime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdfta.format((Date) map.get("planstarttime")));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdfta.format((Date) map.get("planendtime")));
                 int ymd_halfyear = (int) map.get("ymd_halfyear");
                 String strhalfyear = "";
-                switch (ymd_halfyear){
-                    case 1:strhalfyear="上半年";break;
-                    case 2:strhalfyear="下半年";break;
+                switch (ymd_halfyear) {
+                    case 1:
+                        strhalfyear = "上半年";
+                        break;
+                    case 2:
+                        strhalfyear = "下半年";
+                        break;
                 }
-                vo.setTitle(map.get("ymd_year")+"年"+strhalfyear+"-"+map.get("title"));
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setTitle(map.get("ymd_year") + "年" + strhalfyear + "-" + map.get("title"));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
 
-        } if(type==5){//处理每年的数据
-            for(Map map:list){
+        }
+        if (type == 5) {//处理每年的数据
+            for (Map map : list) {
                 ResumptionTaskListVo vo = new ResumptionTaskListVo();
                 vo.setId(map.get("id").toString());
-                vo.setPlanstarttime(map.get("planstarttime")==null?"":sdfta.format((Date) map.get("planstarttime")));
-                vo.setPlanendtime( map.get("planendtime")==null?"":sdfta.format((Date) map.get("planendtime")));
-                vo.setTitle(map.get("ymd_year")+"年-"+map.get("title"));
-                vo.setStatus((int)map.get("status"));
-                vo.setSubmitBy(map.get("submitBy")==null?"":map.get("submitBy").toString());
-                vo.setSubmitTime(map.get("submitTime")==null?"":sdftb.format((Date) map.get("submitTime")));
+                vo.setPlanstarttime(map.get("planstarttime") == null ? "" : sdfta.format((Date) map.get("planstarttime")));
+                vo.setPlanendtime(map.get("planendtime") == null ? "" : sdfta.format((Date) map.get("planendtime")));
+                vo.setTitle(map.get("ymd_year") + "年-" + map.get("title"));
+                vo.setStatus((int) map.get("status"));
+                vo.setSubmitBy(map.get("submitBy") == null ? "" : map.get("submitBy").toString());
+                vo.setSubmitTime(map.get("submitTime") == null ? "" : sdftb.format((Date) map.get("submitTime")));
                 listVos.add(vo);
             }
 
         }
         return listVos;
     }
-    public List<Map<String,Object>>taskarealistnew(TaskDetailsDto request){
+
+    public List<Map<String, Object>> taskarealistnew(TaskDetailsDto request) {
         //根据计划id 关联要点，获取区域列表
         //Resumption resumption = resumptionService.find(taskid);
         Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
         String taskid = request.getTaskId();
         List<ResumptionNfcInfoVo> nfcs = appResumptionDataNfcService.findPointNfcData(taskid, resumption.getOrgId());
         //List<AppResumptionDataImg> imgs = appResumptionDataImgService.getResumptionImgs(resumption.getId());
-        List<AppResumptionTaskDataRemarkimg> imgs = appResumptionTaskDataRemarkimgService.list((new QueryWrapper<AppResumptionTaskDataRemarkimg>()).lambda().eq(AppResumptionTaskDataRemarkimg::getTaskId,resumption.getId()));
+//        List<AppResumptionTaskDataRemarkimg> imgs = appResumptionTaskDataRemarkimgService.list((new QueryWrapper<AppResumptionTaskDataRemarkimg>()).lambda().eq(AppResumptionTaskDataRemarkimg::getTaskId,resumption.getId()));
+        List<AppResumptionTaskDataRemarkimg> imgs = new ArrayList<>();
         List<ResumptionInfoVo> list = appResumptionDataService.findDataByTaskId(taskid);
-        Map<Long,List<AppResumptionTaskDataRemarkimg>> pointImgs = new HashMap<>();
+        Map<Long, List<AppResumptionTaskDataRemarkimg>> pointImgs = new HashMap<>();
         for (AppResumptionTaskDataRemarkimg img : imgs) {
             List<AppResumptionTaskDataRemarkimg> imgList = pointImgs.get(img.getTaskDataId());
-            if(imgList == null){
+            if (imgList == null) {
                 imgList = new ArrayList<>();
                 imgList.add(img);
-                pointImgs.put(img.getTaskDataId(),imgList);
-            }else{
+                pointImgs.put(img.getTaskDataId(), imgList);
+            } else {
                 imgList.add(img);
-                pointImgs.put(img.getTaskDataId(),imgList);
+                pointImgs.put(img.getTaskDataId(), imgList);
             }
         }
-        Map<Long,Set<ResumptionNfcInfoVo>> areaMap = new HashMap<>();
-        Map<Long,List<ResumptionNfcInfoVo>> itemNfc = new HashMap<>();
+        Map<Long, Set<ResumptionNfcInfoVo>> areaMap = new HashMap<>();
+        Map<Long, List<ResumptionNfcInfoVo>> itemNfc = new HashMap<>();
         for (ResumptionNfcInfoVo nfc : nfcs) {
             Set<ResumptionNfcInfoVo> infos = areaMap.get(nfc.getAreaId());
-            if(infos == null){
+            if (infos == null) {
                 infos = new HashSet<>();
                 infos.add(nfc);
-                areaMap.put(nfc.getAreaId(),infos);
-            }else{
+                areaMap.put(nfc.getAreaId(), infos);
+            } else {
                 infos.add(nfc);
-                areaMap.put(nfc.getAreaId(),infos);
+                areaMap.put(nfc.getAreaId(), infos);
             }
             List<ResumptionNfcInfoVo> pointNfcs = itemNfc.get(nfc.getPointId());
-            if(pointNfcs == null){
+            if (pointNfcs == null) {
                 pointNfcs = new ArrayList<>();
                 pointNfcs.add(nfc);
-                itemNfc.put(nfc.getPointId(),pointNfcs);
-            }else{
+                itemNfc.put(nfc.getPointId(), pointNfcs);
+            } else {
                 pointNfcs.add(nfc);
-                itemNfc.put(nfc.getPointId(),pointNfcs);
+                itemNfc.put(nfc.getPointId(), pointNfcs);
             }
         }
-        Map<Long,Map<String,Object>> rel = new HashMap<>();
-        Map<Long,Map<String,Object>> items = new HashMap<>();
+        Map<Long, Map<String, Object>> rel = new HashMap<>();
+        Map<Long, Map<String, Object>> items = new HashMap<>();
         for (ResumptionInfoVo obj : list) {
             Long areaId = obj.getAreaId();
             Map<String, Object> areaData = rel.get(areaId);
-            if(areaData == null){
+            if (areaData == null) {
                 //如果不存在区域
                 areaData = new HashMap<>();
-                areaData.put("areaid",areaId.toString());
-                areaData.put("areaname",obj.getAreaName());
-                areaData.put("nfclist",areaMap.get(areaId)==null?new ArrayList<>():areaMap.get(areaId));
-                List<Map<String,Object>> checklist = new ArrayList<>();
-                Map<String,Object> item = new HashMap<>();
-                item.put("itemid",obj.getItemId());
-                item.put("itemname",obj.getItemName());
-                List<Map<String,Object>> checkitemlist = new ArrayList<>();
-                Map<String,Object> checkItem =  sealData(obj,itemNfc,pointImgs);
+                areaData.put("areaid", areaId.toString());
+                areaData.put("areaname", obj.getAreaName());
+                areaData.put("nfclist", areaMap.get(areaId) == null ? new ArrayList<>() : areaMap.get(areaId));
+                List<Map<String, Object>> checklist = new ArrayList<>();
+                Map<String, Object> item = new HashMap<>();
+                item.put("itemid", obj.getItemId());
+                item.put("itemname", obj.getItemName());
+                List<Map<String, Object>> checkitemlist = new ArrayList<>();
+                Map<String, Object> checkItem = sealData(obj, itemNfc, pointImgs);
                 checkitemlist.add(checkItem);
-                item.put("checkitemlist",checkitemlist);
-                items.put(obj.getItemId(),item);
+                item.put("checkitemlist", checkitemlist);
+                items.put(obj.getItemId(), item);
                 checklist.add(item);
-                areaData.put("checklist",checklist);
-                rel.put(areaId,areaData);
-            }else{
+                areaData.put("checklist", checklist);
+                rel.put(areaId, areaData);
+            } else {
                 //如果存在区域
                 Map<String, Object> item = items.get(obj.getItemId());
-                List<Map<String,Object>> checklist = (List<Map<String, Object>>) areaData.get("checklist");
-                if(item == null){
+                List<Map<String, Object>> checklist = (List<Map<String, Object>>) areaData.get("checklist");
+                if (item == null) {
                     item = new HashMap<>();
-                    item.put("itemid",obj.getItemId());
-                    item.put("itemname",obj.getItemName());
-                    List<Map<String,Object>> checkitemlist = new ArrayList<>();
-                    Map<String,Object> checkItem = sealData(obj,itemNfc,pointImgs);
+                    item.put("itemid", obj.getItemId());
+                    item.put("itemname", obj.getItemName());
+                    List<Map<String, Object>> checkitemlist = new ArrayList<>();
+                    Map<String, Object> checkItem = sealData(obj, itemNfc, pointImgs);
                     checkitemlist.add(checkItem);
-                    item.put("checkitemlist",checkitemlist);
-                    items.put(obj.getItemId(),item);
+                    item.put("checkitemlist", checkitemlist);
+                    items.put(obj.getItemId(), item);
                     checklist.add(item);
-                }else{
-                    List<Map<String,Object>> checkitemlist = (List<Map<String, Object>>) item.get("checkitemlist");
-                    Map<String,Object> checkItem  = sealData(obj,itemNfc,pointImgs);
+                } else {
+                    List<Map<String, Object>> checkitemlist = (List<Map<String, Object>>) item.get("checkitemlist");
+                    Map<String, Object> checkItem = sealData(obj, itemNfc, pointImgs);
                     checkitemlist.add(checkItem);
-                    item.put("checkitemlist",checkitemlist);
-                    items.put(obj.getItemId(),item);
+                    item.put("checkitemlist", checkitemlist);
+                    items.put(obj.getItemId(), item);
                 }
-                rel.put(areaId,areaData);
+                rel.put(areaId, areaData);
             }
         }
-        List<Map<String,Object>> results = new ArrayList<>();
-        for (Map.Entry<Long,Map<String,Object>> entry : rel.entrySet()){
+        List<Map<String, Object>> results = new ArrayList<>();
+        for (Map.Entry<Long, Map<String, Object>> entry : rel.entrySet()) {
             Map<String, Object> value = entry.getValue();
             results.add(value);
         }
         return results;
     }
+
     private Map<String, Object> sealData(ResumptionInfoVo obj, Map<Long, List<ResumptionNfcInfoVo>> itemNfc, Map<Long, List<AppResumptionTaskDataRemarkimg>> pointImgs) {
         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-        Map<String,Object> checkItem = new HashMap<>();
-        checkItem.put("pointid",obj.getPointId());
-        checkItem.put("pointname",obj.getPointName());
-        checkItem.put("resvalue",obj.getDataValue());
-        checkItem.put("resstatus",obj.getDataStatus());
-        checkItem.put("resTime",obj.getDataTime() == null ? "" :sdf.format(obj.getDataTime()));
-        checkItem.put("timeType",obj.getTimeType());
-        checkItem.put("pointdataid",obj.getId());
-        checkItem.put("pointnfclist",itemNfc.get(obj.getPointId())==null?new ArrayList<>():itemNfc.get(obj.getPointId()));
-        checkItem.put("imglist",pointImgs.get(obj.getId())==null?new ArrayList<>():pointImgs.get(obj.getId()));
-        checkItem.put("pointnum",obj.getPointNum());
-        checkItem.put("resremark",obj.getDataRemark());
+        Map<String, Object> checkItem = new HashMap<>();
+        checkItem.put("pointid", obj.getPointId());
+        checkItem.put("pointname", obj.getPointName());
+        checkItem.put("resvalue", obj.getDataValue());
+        checkItem.put("resstatus", obj.getDataStatus());
+        checkItem.put("resTime", obj.getDataTime() == null ? "" : sdf.format(obj.getDataTime()));
+        checkItem.put("timeType", obj.getTimeType());
+        checkItem.put("pointdataid", obj.getId());
+        checkItem.put("pointnfclist", itemNfc.get(obj.getPointId()) == null ? new ArrayList<>() : itemNfc.get(obj.getPointId()));
+        checkItem.put("imglist", pointImgs.get(obj.getId()) == null ? new ArrayList<>() : pointImgs.get(obj.getId()));
+        checkItem.put("pointnum", obj.getPointNum());
+        checkItem.put("resremark", obj.getDataRemark());
         return checkItem;
     }
 
     public ResumptionTaskListVo getTaskObjByTaskid(TaskDetailsDto request) throws ParseException {
-        List<Map<String, Object> > map = resumptionService.findOneByTaskId(request);
+        List<Map<String, Object>> map = resumptionService.findOneByTaskId(request);
 
-        return  taskListVo(map,(int) map.get(0).get("type")).get(0);
+        return taskListVo(map, (int) map.get(0).get("type")).get(0);
 
     }
+
     @Transactional(rollbackFor = Exception.class)
     public void deleteTaskData(Resumption resumption) {
         //删除Nfc数据
         QueryWrapper<AppResumptionDataNfc> qwNfc = new QueryWrapper();
-        qwNfc.lambda().eq(AppResumptionDataNfc::getResumptionId,resumption.getId());
+        qwNfc.lambda().eq(AppResumptionDataNfc::getResumptionId, resumption.getId());
         appResumptionDataNfcService.remove(qwNfc);
         //删除检查项数据
         QueryWrapper<AppResumptionData> qwData = new QueryWrapper();
-        qwData.lambda().eq(AppResumptionData::getResumptionId,resumption.getId());
+        qwData.lambda().eq(AppResumptionData::getResumptionId, resumption.getId());
         appResumptionDataService.remove(qwData);
         //删除备注
 //        QueryWrapper<AppResumptionTaskDataRemark> qwRemark = new QueryWrapper();
@@ -417,7 +444,7 @@ public class ResumptionBusiness {
 //        appResumptionTaskDataRemarkService.remove(qwRemark);
         //删除图片
         QueryWrapper<AppResumptionTaskDataRemarkimg> qwRemarkImg = new QueryWrapper();
-        qwRemarkImg.lambda().eq(AppResumptionTaskDataRemarkimg::getTaskId,resumption.getId());
+        qwRemarkImg.lambda().eq(AppResumptionTaskDataRemarkimg::getTaskId, resumption.getId());
         appResumptionTaskDataRemarkimgService.remove(qwRemarkImg);
         //删除问题整改()
 //        QueryWrapper<AppQuestionTask> qwQuestion = new QueryWrapper();
@@ -434,25 +461,26 @@ public class ResumptionBusiness {
 
 
     }
-    public List<Map<String,Object>> toTaskDetails(TaskDetailsDto request){
-        SysConfig nfcLock = systemParameService.findFirstByCode(SystemParameterConstant.NFC_RESUMPTION_LOCK, SecurityConstants.INNER).getData();
+
+    public List<Map<String, Object>> toTaskDetails(TaskDetailsDto request) {
+//        SysConfig nfcLock = systemParameService.findFirstByCode(SystemParameterConstant.NFC_RESUMPTION_LOCK, SecurityConstants.INNER).getData();
         //Resumption resumption = resumptionService.find(taskid);
         Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
-        List<Map<String,Object>> arealsit = new ArrayList<>();
+        List<Map<String, Object>> arealsit = new ArrayList<>();
         List<ResumptionPointVo> pointList = appRulePointService.findPointByRulePlan(resumption.getPlanId());
         Set<Long> nfcBindIdList = new HashSet<>();
-        pointList.forEach(r->{
+        pointList.forEach(r -> {
             nfcBindIdList.add(r.getAreaid());
             r.setPointdataid(IDHelper.id());
         });
         //获取nfc
-        List<ResumptionNfcVo> nfclists =appResumptionDataNfcService.findNfcByAreaIdAndOrgId(nfcBindIdList,resumption.getOrgId(),resumption.getPlanId());
+        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));
+                (Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ResumptionNfcVo -> ResumptionNfcVo.getNfccdoe()))), ArrayList::new));
 
-        try{
-            for(ResumptionPointVo pointVo:pointList) {
+        try {
+            for (ResumptionPointVo pointVo : pointList) {
                 List<ResumptionNfcVo> nfclista = nfclist.stream().filter(r -> r.getPointId().equals(pointVo.getPointid())).collect(Collectors.toList());
                 if (nfclista != null && nfclista.size() > 0) {
                     nfclista.forEach(r -> r.setNfcdataid(IDHelper.id()));
@@ -490,57 +518,58 @@ public class ResumptionBusiness {
 
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         //将数据按区域分组
-        Map<Long,List<ResumptionPointVo>> pointListMap = pointList.stream().collect(Collectors.groupingBy(r->r.getAreaid()));
-        for(Long key:pointListMap.keySet()){
+        Map<Long, List<ResumptionPointVo>> pointListMap = pointList.stream().collect(Collectors.groupingBy(r -> r.getAreaid()));
+        for (Long key : pointListMap.keySet()) {
             List<ResumptionPointVo> pointsList = pointListMap.get(key);
-            if(pointsList==null||pointsList.size()==0){
+            if (pointsList == null || pointsList.size() == 0) {
                 continue;
             }
 
 
-            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(nfcLock.getValue())){
-                if(areanfclist == null || areanfclist.size() == 0){
+            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) {
                     continue;
                 }
 
             }
 
-            area.put("nfclist",areanfclist==null?new ArrayList<>():areanfclist);
+            area.put("nfclist", areanfclist == null ? new ArrayList<>() : areanfclist);
             //将区域内的要点按检查项分组
-            Map<Long,List<ResumptionPointVo>> pointsListMapItem = pointsList.stream().collect(Collectors.groupingBy(r->r.getItemid()));
-            List<Map<String,Object>> checklist = new ArrayList<>();
-            for(Long keya:pointsListMapItem.keySet()){
+            Map<Long, List<ResumptionPointVo>> pointsListMapItem = pointsList.stream().collect(Collectors.groupingBy(r -> r.getItemid()));
+            List<Map<String, Object>> checklist = new ArrayList<>();
+            for (Long keya : pointsListMapItem.keySet()) {
                 List<ResumptionPointVo> checkitemlist = pointsListMapItem.get(keya);
-                if(checkitemlist==null||checkitemlist.size()==0){
+                if (checkitemlist == null || checkitemlist.size() == 0) {
                     continue;
                 }
-                Map<String,Object> item = new HashMap<>();
-                item.put("itemid",keya);
-                item.put("itemname",checkitemlist.get(0).getItemname());
-                item.put("checkitemlist",checkitemlist);
+                Map<String, Object> item = new HashMap<>();
+                item.put("itemid", keya);
+                item.put("itemname", checkitemlist.get(0).getItemname());
+                item.put("checkitemlist", checkitemlist);
                 checklist.add(item);
             }
-            area.put("checklist",checklist);
+            area.put("checklist", checklist);
             arealsit.add(area);
 
         }
         return arealsit;
     }
+
     @Transactional(rollbackFor = Exception.class)
     public int submitTaskData(ResumptionTaskDataDto request, LoginUser user, Resumption resumption) throws ParseException {
         int result = 0;
         Date time = new Date();
         List<AppResumptionDataNfc> nfcList = request.getNfcdata();
         //传值的时候，要新增nfcId（页面取checkId）pointId
-        nfcList.stream().forEach(n->n.setResumptionId(request.getTaskid()).setId(IDHelper.id()));
+        nfcList.stream().forEach(n -> n.setResumptionId(request.getTaskid()).setId(IDHelper.id()));
         //传值的时候，要新增nfcId（页面取checkId）pointId
         appResumptionDataNfcService.saveBatch(nfcList);
         //获取未扫描的nfc数据
@@ -561,18 +590,18 @@ public class ResumptionBusiness {
             data.setSubmitBy(user.getUserid()).setSubmitName(user.getUsername()).setSubmitTime(time);
             data.setResValue(appResumptionDataDto.getResValue());
             data.setResRemark(appResumptionDataDto.getResRemark());
-            if(StringUtils.isNotEmpty(appResumptionDataDto.getResTime())){
+            if (StringUtils.isNotEmpty(appResumptionDataDto.getResTime())) {
                 data.setResTime(sdf.parse(appResumptionDataDto.getResTime()));
             }
-            if(time.before(resumption.getPlanEndTime())){
+            if (time.before(resumption.getPlanEndTime())) {
                 //最终提交时间小于计划结束时间
                 data.setResStatus(1);
-            }else {
+            } else {
                 //最终提交时间大于计划结束时间
                 data.setResStatus(3);
             }
             list.add(data);
-            if(StringUtils.isNotEmpty(appResumptionDataDto.getResRemark())||(appResumptionDataDto.getImgData()!=null&&appResumptionDataDto.getImgData().size()>0)) {
+            if (StringUtils.isNotEmpty(appResumptionDataDto.getResRemark()) || (appResumptionDataDto.getImgData() != null && appResumptionDataDto.getImgData().size() > 0)) {
 //                AppResumptionTaskDataRemark remark = new AppResumptionTaskDataRemark();
 //                remark.setRemark(appResumptionDataDto.getResRemark() == null ? "" : appResumptionDataDto.getResRemark());
 //                remark.setId(IDHelper.id());
@@ -597,24 +626,24 @@ public class ResumptionBusiness {
         }
         appResumptionDataService.saveBatch(list);
         //获取未提交的履职数据当未提交的履职数据为0时，修改履职任务为已完成
-        int num = (int) appResumptionDataService.count((new QueryWrapper<AppResumptionData>()).lambda().eq(AppResumptionData::getResumptionId,request.getTaskid()).isNull(AppResumptionData::getSubmitTime));
-        if(resumption.getStartTime()==null){//第一次提交数据的时候修改任务开始时间为当前时间
+        int num = (int) appResumptionDataService.count((new QueryWrapper<AppResumptionData>()).lambda().eq(AppResumptionData::getResumptionId, request.getTaskid()).isNull(AppResumptionData::getSubmitTime));
+        if (resumption.getStartTime() == null) {//第一次提交数据的时候修改任务开始时间为当前时间
             resumption.setStartTime(time);
         }
         resumption.setEndTime(time);
         resumption.setSubmitTime(time);
-        if(num==0){//所有履职数据都已提交
-            if(time.before(resumption.getPlanEndTime())){
+        if (num == 0) {//所有履职数据都已提交
+            if (time.before(resumption.getPlanEndTime())) {
                 //最终提交时间小于计划结束时间
-                resumption.setStatus(ResumptionStatus.NORMAL);
-            }else {
+                resumption.setStatus(2);
+            } else {
                 //最终提交时间大于计划结束时间
-                resumption.setStatus(ResumptionStatus.DELAY);
+                resumption.setStatus(3);
             }
 
         }
         //获取履职数据异常的数据个数
-        int exceptionCount = (int) appResumptionDataService.count((new QueryWrapper<AppResumptionData>()).lambda().eq(AppResumptionData::getResumptionId,request.getTaskid()).eq(AppResumptionData::getResValue,1));
+        int exceptionCount = (int) appResumptionDataService.count((new QueryWrapper<AppResumptionData>()).lambda().eq(AppResumptionData::getResumptionId, request.getTaskid()).eq(AppResumptionData::getResValue, 1));
         resumption.setExceptionCount(exceptionCount);
         resumption.setUpdateTime(time);
 //        resumption.setModifiedId(user.getId());

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.ResumptionTaskDataDto;
+import com.xunmei.core.resumption.dto.ResumptionTaskDto;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
+import com.xunmei.core.resumption.vo.ResumptionAppVo;
+import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
@@ -18,10 +21,16 @@ public interface ResumptionService extends IService<Resumption> {
     List<Map<String, Object>> findDayTaskList(int year, int quarter, String dateTime, Long roleId, Long orgid);
 
     List<Map<String, Object>> findMonthTaskList(int year, int month, int type, Long roleId, Long orgid, int quarter);
-    List<Map<String, Object>> findYearTaskList(int year, int type, Long roleId, Long orgid,int quarter);
+
+    List<Map<String, Object>> findYearTaskList(int year, int type, Long roleId, Long orgid, int quarter);
 
     Resumption findOneByTaskIdAndDate(TaskDetailsDto request);
+
     Resumption findOneByTaskIdAndDate(ResumptionTaskDataDto request);
+
     List<Map<String, Object>> findOneByTaskId(TaskDetailsDto request);
+
     void updateResumption(@Param("resumption") Resumption resumption);
+
+    List<ResumptionAppVo> findResumptionApp(@Param("res") ResumptionTaskNewDto res);
 }

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

@@ -14,14 +14,12 @@ import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleRequestVo;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author : 高雄
@@ -157,10 +155,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 throw new RuntimeException("请选择履职要点");
             }
 
-            AppPlanToItem item = null;
+            AppPlanToPoint item = null;
             for (RuleItemVo ruleItemVo : itemList) {
-                item = new AppPlanToItem();
-                item.setItemId(ruleItemVo.getItemId());
+                item = new AppPlanToPoint();
+                item.setPointId(ruleItemVo.getId());
                 item.setPlanId(id);
                 item.setPointScan(ruleItemVo.isPointScan());
                 item.setRequired(ruleItemVo.isRequired());
@@ -206,8 +204,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             apr.lambda().eq(AppPlanToRole::getPlanId, id);
             appPlanToRoleMapper.delete(apr);
 
-            QueryWrapper<AppPlanToItem> api = new QueryWrapper<>();
-            api.lambda().eq(AppPlanToItem::getPlanId, id);
+            QueryWrapper<AppPlanToPoint> api = new QueryWrapper<>();
+            api.lambda().eq(AppPlanToPoint::getPlanId, id);
             appPlanToItemMapper.delete(api);
 
 
@@ -232,10 +230,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             if (itemList.size() == 0) {
                 throw new RuntimeException("请选择履职要点");
             }
-            AppPlanToItem item = null;
+            AppPlanToPoint item = null;
             for (RuleItemVo ruleItemVo : itemList) {
-                item = new AppPlanToItem();
-                item.setItemId(ruleItemVo.getItemId());
+                item = new AppPlanToPoint();
+                item.setPointId(ruleItemVo.getId());
                 item.setPlanId(id);
                 item.setPointScan(ruleItemVo.isPointScan());
                 item.setRequired(ruleItemVo.isRequired());
@@ -278,9 +276,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         }
         appPlanVo.setRoleList(roleIds);
 
-        QueryWrapper<AppPlanToItem> api = new QueryWrapper<>();
-        api.lambda().eq(AppPlanToItem::getPlanId, id);
-        List<AppPlanToItem> appPlanToItems = appPlanToItemMapper.selectList(api);
+        QueryWrapper<AppPlanToPoint> api = new QueryWrapper<>();
+        api.lambda().eq(AppPlanToPoint::getPlanId, id);
+//        List<AppPlanToPoint> appPlanToPoints = appPlanToItemMapper.selectList(api);
 
         List<RuleItemVo> ruleItemVos = baseMapper.selectByPlanId(id);
 
@@ -326,8 +324,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         appPlanToRoleMapper.delete(qw);
 
         //删除对应的要点关系
-        QueryWrapper<AppPlanToItem> aw = new QueryWrapper<>();
-        aw.lambda().eq(AppPlanToItem::getPlanId, id);
+        QueryWrapper<AppPlanToPoint> aw = new QueryWrapper<>();
+        aw.lambda().eq(AppPlanToPoint::getPlanId, id);
         appPlanToItemMapper.delete(aw);
 
         //删除机构关系

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

@@ -5,11 +5,14 @@ import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.ResumptionTaskDataDto;
+import com.xunmei.core.resumption.dto.ResumptionTaskDto;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
 import com.xunmei.core.resumption.mapper.ResumptionMapper;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.service.ResumptionService;
+import com.xunmei.core.resumption.vo.ResumptionAppVo;
+import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -71,4 +74,9 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
         resumptionMapper.updateResumption(resumption);
     }
 
+    @Override
+    public List<ResumptionAppVo> findResumptionApp(ResumptionTaskNewDto res) {
+        return resumptionMapper.findResumptionApp(res);
+    }
+
 }

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

@@ -161,7 +161,7 @@ public class SysResumptionServiceImpl extends ServiceImpl<SysResumptionMapper, S
             String id = UUID.randomUUID().toString().replaceAll("-", "");
             SysResumption resumption =new SysResumption();
             //resumption.changeWork(isWork);
-            resumption.setStatus((long) ResumptionStatus.WAIT.ordinal());
+            resumption.setStatus((long) 1);
             resumption.setYmd(ymd);
             resumption.setYmdDate(ymd.getDate());
             resumption.setYmdDay(Long.valueOf(ymd.getDay()));

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

@@ -0,0 +1,11 @@
+package com.xunmei.core.resumption.vo;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+@Data
+public class ResumptionAppRetVo {
+    HashMap<String,List<ResumptionAppVo>> day;
+    HashMap<String,List<ResumptionAppVo>> noDay;
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.core.resumption.vo;
+
+import com.xunmei.core.resumption.domain.Resumption;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ResumptionAppVo  {
+    private String planName;
+    private String id;
+    private Date planStartTime;
+    private Date planEndTime;
+    private Integer status;
+    private Integer planCycle;
+}

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

@@ -0,0 +1,19 @@
+package com.xunmei.core.resumption.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class ResumptionTaskNewDto {
+    @ApiModelProperty(value = "日期")
+    private Date dateTime;
+    @ApiModelProperty(value = "角色id")
+    private String roleId;
+    @ApiModelProperty(value = "机构id")
+    private String orgid;
+
+}

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

@@ -111,7 +111,7 @@
         a.business_type as businessType
         from sys_rule_point a
         inner JOIN sys_rule_item b on a.item_id = b.id
-        inner JOIN t_area c on a.area_id = c.id
+        inner JOIN sys_area c on a.area_id = c.id
         inner JOIN sys_rule d on b.rule_id = d.id
         where 1=1
         <if test="info.ruleId != null">
@@ -138,8 +138,8 @@
                h.required,
                d.name  as ruleName,
                a.business_type as businessType
-        FROM (SELECT item_id, point_scan, required FROM core_resumption_plan_to_item WHERE plan_id = #{planId}) h
-                 LEFT JOIN core_resumption_rule_point a ON h.item_id = a.item_id
+        FROM (SELECT point_id, point_scan, required FROM core_resumption_plan_to_point WHERE plan_id = #{planId}) h
+                 LEFT JOIN core_resumption_rule_point a ON h.point_id = a.id
                  LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id
                  LEFT JOIN sys_area c ON a.area_id = c.id
                  LEFT JOIN core_resumption_rule d on b.rule_id = d.id

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToItemMapper">
     <sql id="tableName">
-        core_resumption_plan_to_item
+        core_resumption_plan_to_point
     </sql>
 
     <sql id="baseColumn">
@@ -10,8 +10,8 @@
     </sql>
 
     <select id="selectItemIdsByPlanId" resultType="java.lang.Long">
-        select distinct item_id
-        from core_resumption_plan_to_item
+        select distinct point_id as item_id
+        from core_resumption_plan_to_point
         where plan_id = #{planId}
     </select>
 </mapper>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppResumptionDataMapper">
     <sql id="tableName">
-        t_app_resumption_data
+        core_resumption_data
     </sql>
 
     <sql id="baseColumn">
@@ -10,46 +10,46 @@
     </sql>
 
     <select id="findTaskDataList" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT c.id as itemid,c.item_name as itemname FROM t_app_resumption_data a LEFT JOIN t_app_rule_point b ON a.item_id= b.id LEFT JOIN t_app_rule_item c ON b.item_id = c.id WHERE a.resumption_id=#{taskid} AND b.area_id=#{areaid} GROUP BY c.id having c.id is not null
+           SELECT c.id as itemid,c.item_name as itemname FROM core_resumption_data a LEFT JOIN core_resumption_rule_point b ON a.item_id= b.id LEFT JOIN core_resumption_rule_item c ON b.item_id = c.id WHERE a.resumption_id=#{taskid} AND b.area_id=#{areaid} GROUP BY c.id having c.id is not null
     </select>
 
     <select id="findCheckDataList" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT a.id AS pointdataid,b.id AS pointid,b.point_name AS pointname,b.point_num AS pointnum,a.res_value AS resvalue,a.res_status AS resstatus,a.res_remark AS resremark,b.time_type as timeType,a.res_time as resTime FROM t_app_resumption_data a LEFT JOIN t_app_rule_point b ON a.item_id  = b.id WHERE a.resumption_id=#{taskid} AND b.area_id=#{areaid} and b.item_id = #{itemid}  order BY b.point_num asc
+           SELECT a.id AS pointdataid,b.id AS pointid,b.point_name AS pointname,b.point_num AS pointnum,a.res_value AS resvalue,a.res_status AS resstatus,a.res_remark AS resremark,b.time_type as timeType,a.res_time as resTime FROM core_resumption_data a LEFT JOIN core_resumption_rule_point b ON a.item_id  = b.id WHERE a.resumption_id=#{taskid} AND b.area_id=#{areaid} and b.item_id = #{itemid}  order BY b.point_num asc
     </select>
 
     <select id="findAreaListPlan" parameterType="String" resultType="java.util.Map">
-          SELECT a.area_id as areaid,b.name as areaname from t_app_resumption_data a LEFT JOIN t_area b ON a.area_id = b.id WHERE a.resumption_id=#{taskid} GROUP BY a.area_id
+          SELECT a.area_id as areaid,b.name as areaname from core_resumption_data a LEFT JOIN sys_area b ON a.area_id = b.id WHERE a.resumption_id=#{taskid} GROUP BY a.area_id
     </select>
 
     <select id="findTaskDataListNew" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT c.id as itemid,c.item_name as itemname,ANY_VALUE(a.area_id) AS areaid FROM t_app_resumption_data a LEFT JOIN t_app_rule_point b ON a.item_id= b.id LEFT JOIN t_app_rule_item c ON b.item_id = c.id WHERE a.resumption_id=#{taskid} GROUP BY c.id having c.id is not null
+           SELECT c.id as itemid,c.item_name as itemname,ANY_VALUE(a.area_id) AS areaid FROM core_resumption_data a LEFT JOIN core_resumption_rule_point b ON a.item_id= b.id LEFT JOIN core_resumption_rule_item c ON b.item_id = c.id WHERE a.resumption_id=#{taskid} GROUP BY c.id having c.id is not null
     </select>
 
 
     <select id="findCheckDataListNew" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT a.id AS pointdataid,b.id AS pointid,b.point_name AS pointname,b.point_num AS pointnum,a.res_value AS resvalue,a.res_status AS resstatus,a.res_remark AS resremark,b.time_type as timeType,a.res_time as resTime, b.area_id as areaid , b.item_id as itemid FROM t_app_resumption_data a LEFT JOIN t_app_rule_point b ON a.item_id  = b.id WHERE a.resumption_id=#{taskid}   order BY b.point_num asc
+           SELECT a.id AS pointdataid,b.id AS pointid,b.point_name AS pointname,b.point_num AS pointnum,a.res_value AS resvalue,a.res_status AS resstatus,a.res_remark AS resremark,b.time_type as timeType,a.res_time as resTime, b.area_id as areaid , b.item_id as itemid FROM core_resumption_data a LEFT JOIN core_resumption_rule_point b ON a.item_id  = b.id WHERE a.resumption_id=#{taskid}   order BY b.point_num asc
     </select>
 
     <select id="findDataByTaskId" parameterType="java.util.HashMap" resultType="com.xunmei.core.resumption.vo.ResumptionInfoVo">
         SELECT
             a.id,
-            c.id item_id,
-            c.item_name,
-            d.id point_id,
-            d.point_name,
-            d.point_num,
-            b.id area_id,
-            b.NAME area_name,
-            a.res_value data_value,
-            a.res_time data_time,
-            a.res_remark data_remark,
-            a.res_status data_status,
-	        d.time_type
+            c.id as  item_id,
+            c.name as item_name,
+            d.id as point_id,
+            d.name as point_name,
+--             d.point_num,
+            b.id as area_id,
+            b.NAME as  area_name,
+            a.res_value  as data_value,
+            a.res_time  as data_time,
+            a.res_remark as  data_remark,
+            a.res_status as data_status
+-- 	        d.time_type
         FROM
-            t_app_resumption_data a
-            LEFT JOIN t_area b ON a.area_id = b.id
-            LEFT JOIN t_app_rule_point d ON a.item_id = d.id
-            LEFT JOIN t_app_rule_item c ON d.item_id = c.id
+            core_resumption_data a
+            LEFT JOIN sys_area b ON a.area_id = b.id
+            LEFT JOIN core_resumption_rule_point d ON a.item_id = d.id
+            LEFT JOIN core_resumption_rule_item c ON d.item_id = c.id
         WHERE
             a.resumption_id = #{taskId}
 
@@ -60,10 +60,10 @@
         SELECT
             a.*
         FROM
-            t_app_resumption_data a
-            INNER JOIN t_app_resumption r ON a.resumption_id = r.id
+            core_resumption_data a
+            INNER JOIN core_resumption r ON a.resumption_id = r.id
             INNER JOIN core_resumption_plan p ON p.id = a.plan_id
-            LEFT JOIN t_app_rule_point d ON a.item_id = d.id
+            LEFT JOIN core_resumption_rule_point d ON a.item_id = d.id
     WHERE
         r.ymd_date = #{date}
       AND r.org_id = #{orgId}
@@ -73,6 +73,6 @@
     </select>
   
      <update id="updateData" parameterType="String">
-         update  t_app_resumption_data set res_status = 2 where resumption_id =#{taskId}
+         update  core_resumption_data set res_status = 2 where resumption_id =#{taskId}
      </update>
 </mapper>

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

@@ -2,26 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppResumptionDataNfcMapper">
     <sql id="tableName">
-        t_app_resumption_data_nfc
+        core_resumption_data_nfc
     </sql>
 
     <sql id="baseColumn">
         id,resumption_id,nfc_id,submit_time,status
     </sql>
     <select id="findnfcDataList" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT ANY_VALUE(a.id) AS nfcdataid,ANY_VALUE(b.id) AS nfcid,ANY_VALUE(b.code) AS nfccdoe,ANY_VALUE(a.status) as status ,ANY_VALUE(c.check_name) as checkName FROM t_app_resumption_data_nfc a LEFT JOIN t_nfc_bind b ON a.nfc_id = b.check_id  left join t_area_check c on b.check_id = c.id WHERE b.area_id=#{areaid} AND a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code
+           SELECT ANY_VALUE(a.id) AS nfcdataid,ANY_VALUE(b.id) AS nfcid,ANY_VALUE(b.code) AS nfccdoe,ANY_VALUE(a.status) as status ,ANY_VALUE(c.check_name) as checkName FROM core_resumption_data_nfc a LEFT JOIN sys_nfc_bind b ON a.nfc_id = b.check_id  left join sys_area_check c on b.check_id = c.id WHERE b.area_id=#{areaid} AND a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code
     </select>
 
     <select id="findnfcDataListByPointid" parameterType="java.util.HashMap" resultType="java.util.Map">
-     SELECT a.id AS nfcdataid,b.id AS nfcid,b.code AS nfccdoe,a.status,c.check_name as checkName FROM t_app_resumption_data_nfc a LEFT join t_nfc_bind b ON a.nfc_id =b.check_id  left join t_area_check c on b.check_id = c.id WHERE  a.point_id =#{pointid} and a.resumption_id=#{taskid} AND b.org_id =#{orgId}
+     SELECT a.id AS nfcdataid,b.id AS nfcid,b.code AS nfccdoe,a.status,c.check_name as checkName FROM core_resumption_data_nfc a LEFT join sys_nfc_bind b ON a.nfc_id =b.check_id  left join sys_area_check c on b.check_id = c.id WHERE  a.point_id =#{pointid} and a.resumption_id=#{taskid} AND b.org_id =#{orgId}
     </select>
 
     <select id="findnfcDataListNew" parameterType="java.util.HashMap" resultType="java.util.Map">
-           SELECT ANY_VALUE(a.id) AS nfcdataid,ANY_VALUE(b.id) AS nfcid,ANY_VALUE(b.code) AS nfccdoe,ANY_VALUE(a.status) as status ,ANY_VALUE(c.check_name) as checkName,ANY_VALUE(b.area_id) AS areaid FROM t_app_resumption_data_nfc a LEFT JOIN t_nfc_bind b ON a.nfc_id = b.check_id  left join t_area_check c on b.check_id = c.id WHERE  a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code
+           SELECT ANY_VALUE(a.id) AS nfcdataid,ANY_VALUE(b.id) AS nfcid,ANY_VALUE(b.code) AS nfccdoe,ANY_VALUE(a.status) as status ,ANY_VALUE(c.check_name) as checkName,ANY_VALUE(b.area_id) AS areaid FROM core_resumption_data_nfc a LEFT JOIN sys_nfc_bind b ON a.nfc_id = b.check_id  left join sys_area_check c on b.check_id = c.id WHERE  a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code
     </select>
 
     <select id="findnfcDataListByPointidNew" parameterType="java.util.HashMap" resultType="java.util.Map">
-     SELECT a.id AS nfcdataid,b.id AS nfcid,b.code AS nfccdoe,a.status,c.check_name as checkName,a.point_id as pointid FROM t_app_resumption_data_nfc a LEFT join t_nfc_bind b ON a.nfc_id =b.check_id  left join t_area_check c on b.check_id = c.id WHERE  a.resumption_id=#{taskid} AND b.org_id =#{orgId}
+     SELECT a.id AS nfcdataid,b.id AS nfcid,b.code AS nfccdoe,a.status,c.check_name as checkName,a.point_id as pointid FROM core_resumption_data_nfc a LEFT join sys_nfc_bind b ON a.nfc_id =b.check_id  left join sys_area_check c on b.check_id = c.id WHERE  a.resumption_id=#{taskid} AND b.org_id =#{orgId}
     </select>
 
     <select id="findPointNfcData" parameterType="java.util.HashMap" resultType="com.xunmei.core.resumption.vo.ResumptionNfcInfoVo">
@@ -34,9 +34,9 @@
             c.check_name  AS checkName,
             b.area_id  AS area_id
         FROM
-            t_app_resumption_data_nfc a
-            LEFT JOIN t_nfc_bind b ON a.nfc_id = b.check_id and b.enable = 1
-            LEFT JOIN t_area_check c ON b.check_id = c.id
+            core_resumption_data_nfc a
+            LEFT JOIN sys_nfc_bind b ON a.nfc_id = b.check_id and b.enable = 1
+            LEFT JOIN sys_area_check c ON b.check_id = c.id
         WHERE
             a.resumption_id = #{taskid}
             AND b.org_id = #{orgId}
@@ -44,17 +44,28 @@
 
 
 <!--    SELECT ANY_VALUE(a.id) AS nfcdataid,ANY_VALUE(b.id) AS nfcid,ANY_VALUE(b.code) AS nfccdoe,ANY_VALUE(a.status) as status ,ANY_VALUE(c.check_name) as checkName
-       FROM t_app_resumption_data_nfc a LEFT JOIN t_nfc_bind b ON a.nfc_id = b.check_id  left join t_area_check c on b.check_id = c.id WHERE b.area_id=#{areaid} AND a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code-->
+       FROM core_resumption_data_nfc a LEFT JOIN sys_nfc_bind b ON a.nfc_id = b.check_id  left join sys_area_check c on b.check_id = c.id WHERE b.area_id=#{areaid} AND a.resumption_id=#{taskid} AND b.org_id =#{orgId} group by b.code-->
     <select id="findNfcByAreaIdAndOrgId"  parameterType="java.util.HashMap" resultType="com.xunmei.core.resumption.vo.ResumptionNfcVo" >
-        select c.id as checkId,  a.collection_area_name as checkName,a.code as  nfccdoe,d.id as pointId,a.area_id as areaId ,a.id as nfcid from t_nfc_bind a
-        LEFT JOIN t_area_check c ON a.check_id = c.id
-        LEFT JOIN t_app_rule_point d on a.area_id = d.area_id
-        LEFT JOIN core_resumption_plan_to_item e ON e.item_id = d.id
-        where a.org_id =  #{orgId}
-        and e.plan_id = #{planId}
-        and a.check_id is not null
-        and a.enable = 1
-        and e.point_scan = 1
+        SELECT
+        c.id AS checkId,
+        a.collection_area_name AS checkName,
+        a.CODE AS nfccdoe,
+        d.id AS pointId,
+        a.area_id AS areaId,
+        a.id AS nfcid
+        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
+        a.org_id = #{orgId}
+
+        AND e.plan_id = #{planId}
+
+        AND a.check_id IS NOT NULL
+        AND a.ENABLE = 0
+        AND e.point_scan = 1
         <if test="nfcBindIdList!=null and nfcBindIdList.size>0">
             and a.area_id in
             <foreach collection="nfcBindIdList" item="item" open="(" separator="," close=")">

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppResumptionTaskDataRemarkimgMapper">
     <sql id="tableName">
-        t_app_resumption_task_data_remarkimg
+        core_resumption_task_data_remarkimg
     </sql>
 
     <sql id="baseColumn">

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

@@ -27,7 +27,7 @@
 
 <!--    <select id="selectCheckAreaList" resultType="com.isp.core.vo.area.AreaListVo">-->
 <!--        select id, name, org_type as orgType-->
-<!--        from t_area-->
+<!--        from sys_area-->
 <!--        where deleted = 0-->
 <!--    </select>-->
 

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

@@ -28,10 +28,10 @@
 <!--        1 as pointSource-->
 
 <!--        from core_resumption_rule_point p-->
-<!--        inner join t_app_rule_item ri on ri.id=p.item_id-->
+<!--        inner join core_resumption_rule_item ri on ri.id=p.item_id-->
 <!--        inner join sys_area a on p.area_id = a.id-->
 <!--        inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'-->
-<!--        inner join core_resumption_plan_to_item ti on ti.item_id=p.id-->
+<!--        inner join core_resumption_plan_to_point ti on ti.item_id=p.id-->
 <!--        inner join core_resumption_plan ap on ti.plan_id =ap.id-->
 <!--        where p.deleted = 0-->
 <!--        <if test="pointIds != null and pointIds.size > 0">-->
@@ -50,7 +50,7 @@
     <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.AppRulePointTaskVo">
         SELECT a.*, b.point_scan
         from core_resumption_rule_point a
-                 LEFT JOIN core_resumption_plan_to_item b ON a.item_id = b.item_id
+                 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
         WHERE c.id = #{planid}
     </select>
@@ -73,8 +73,8 @@
         ap.id as planId,
         2 as pointSource
         from core_resumption_rule_point p
-        inner join t_app_rule_item ri on ri.id=p.item_id
-        inner join t_area a on p.area_id = a.id
+        inner join core_resumption_rule_item ri on ri.id=p.item_id
+        inner join sys_area a on p.area_id = a.id
         inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'
         inner join t_app_rule ap on p.rule_id =ap.id
         where p.deleted = 0
@@ -96,7 +96,7 @@
 <!--    <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.resumption.AppRulePointTaskVo">-->
 <!--        SELECT a.*, b.point_scan-->
 <!--        from core_resumption_rule_point a-->
-<!--                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id-->
+<!--                 LEFT JOIN core_resumption_plan_to_point b ON a.id = b.item_id-->
 <!--                 LEFT JOIN core_resumption_plan c ON b.plan_id = c.id-->
 <!--        WHERE c.id = #{planid}-->
 <!--    </select>-->
@@ -104,9 +104,9 @@
     <select id="findAreaListPlan" parameterType="Long" resultType="java.util.Map">
         SELECT a.area_id as areaid, d.name as areaname
         from core_resumption_rule_point a
-                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id
+                 LEFT JOIN core_resumption_plan_to_point b ON a.id = b.item_id
                  LEFT JOIN core_resumption_plan c ON b.plan_id = c.id
-                 LEFT JOIN t_area d ON a.area_id = d.id
+                 LEFT JOIN sys_area d ON a.area_id = d.id
         WHERE c.id = #{planid}
     </select>
 
@@ -140,7 +140,7 @@
     </update>
 
     <update id="updatePlanItem">
-        update core_resumption_plan_to_item
+        update core_resumption_plan_to_point
         set item_id=#{newId}
         where item_id = #{id}
     </update>
@@ -173,8 +173,8 @@
 <!--        from core_resumption_rule_point a-->
 <!--                 LEFT JOIN t_app_safecheck_plan_to_item b ON a.id = b.item_id-->
 <!--                 LEFT JOIN t_app_safecheck_plan c ON b.plan_id = c.id-->
-<!--                 LEFT JOIN t_app_rule_item e ON a.item_id = e.id-->
-<!--                 left join t_area f on a.area_id = f.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 sec_book_dt_inst d on a.data_type = d.id-->
 <!--                 left join sec_book_dti_inst d1 on d.id = d1.SEC_BOOK_DT_INST_ID and d1.DATA_ITEM_NUMB='001'-->
 <!--                 left join sec_book_dti_inst d2 on d.id = d2.SEC_BOOK_DT_INST_ID and d2.DATA_ITEM_NUMB='002'-->
@@ -186,8 +186,8 @@
 <!--        a.plan_id as planId,e.item_name as itemName,a.id as pointDataId,a.res_value as resValue,a.res_time as resTime,a.res_value as resValue,d.DATA_NAME as dataName,-->
 <!--       d1.DATA_ITEM_NAME as dataDetailNameA,d2.DATA_ITEM_NAME as dataDetailNameB-->
 <!--       FROM t_app_safety_task_data a LEFT JOIN core_resumption_rule_point b ON a.point_id  = b.id-->
-<!--       LEFT JOIN t_area f ON a.area_id = f.id-->
-<!--       LEFT JOIN t_app_rule_item e ON a.item_id = e.id-->
+<!--       LEFT JOIN sys_area f ON a.area_id = f.id-->
+<!--       LEFT JOIN core_resumption_rule_item e ON a.item_id = e.id-->
 <!--       left join sec_book_dt_inst d on b.data_type = d.id-->
 <!--       left join sec_book_dti_inst d1 on d.id = d1.SEC_BOOK_DT_INST_ID and d1.DATA_ITEM_NUMB='001'-->
 <!--       left join sec_book_dti_inst d2 on d.id = d2.SEC_BOOK_DT_INST_ID and d2.DATA_ITEM_NUMB='002'-->
@@ -196,14 +196,27 @@
 <!--    </select>-->
 
     <select id="findPointByRulePlan" resultType="com.xunmei.core.resumption.vo.ResumptionPointVo">
-         SELECT a.id as pointid,a.point_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,
-        b.plan_id as planId,e.item_name as itemname,b.point_scan as pointScan,b.required,a.business_type as businessType
-        from core_resumption_rule_point a
-                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id
-                 LEFT JOIN core_resumption_plan c ON b.plan_id = c.id
-                 LEFT JOIN t_app_rule_item e ON a.item_id = e.id
-                 left join t_area f on a.area_id = f.id
-        WHERE c.id = #{planId} and a.deleted=0
+        SELECT
+            a.id AS pointid,
+            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,
+            b.plan_id AS planId,
+            e.name AS itemname,
+            b.point_scan AS pointScan,
+            b.required,
+            a.business_type AS businessType
+        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
+        WHERE
+            c.id = #{planId} and a.deleted=0
     </select>
     <select id="checkIsJoinResumptionPlan" resultType="java.lang.Integer">
         SELECT DISTINCT 1

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.ResumptionMapper">
     <update id="updateResumption">
-        update t_app_resumption set
+        update core_resumption set
                                     modified_id=#{resumption.modifiedId},
                                     modified_name=#{resumption.modifiedName},
                                     update_time=#{resumption.updateTime},
@@ -57,7 +57,7 @@
             ymd_week,
             STATUS
         FROM
-            t_app_resumption a
+            core_resumption a
                 LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
         WHERE
             a.ymd_year =#{year}
@@ -83,7 +83,7 @@
             ymd_halfyear,
             STATUS
         FROM
-            t_app_resumption a
+            core_resumption a
                 LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
         WHERE
             a.ymd_year =#{year}
@@ -95,7 +95,7 @@
             a.plan_start_time ASC
     </select>
     <select id="findOneByTaskIdAndDate" resultType="com.xunmei.core.resumption.domain.Resumption">
-        select * from core_resumption where id=#{taskid} and ymd_year=#{year} and ymd_quarter=#{quarter}
+        select * from core_resumption where id=#{taskId} and ymd_year=#{year} and ymd_quarter=#{quarter}
 
     </select>
     <select id="findOneByTaskId" resultType="java.util.Map">
@@ -113,10 +113,10 @@
             ymd_halfyear,
             ymd_month,
             ymd_week,
-            STATUS,
+            status,
             a.type
         FROM
-            t_app_resumption a
+            core_resumption a
                 LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
         WHERE
             a.id =#{taskId}
@@ -124,4 +124,8 @@
           AND a.ymd_quarter =#{quarter}
 
     </select>
+    <select id="findResumptionApp" resultType="com.xunmei.core.resumption.vo.ResumptionAppVo">
+    select r.id,r.plan_start_time,plan_end_time,r.status,p.plan_name,p.plan_cycle from core_resumption r left join core_resumption_plan p on r.plan_id = p.id where r.org_id=#{res.orgid} and r.role_id=#{res.roleId}
+
+    </select>
 </mapper>

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

@@ -253,7 +253,7 @@
                         i.item_name
         from core_resumption_rule_item i
         where i.id in (select item_id
-                       from core_resumption_plan_to_item pti
+                       from core_resumption_plan_to_point pti
                        where pti.plan_id in (select plan_id from core_resumption where id = #{resumptionId}))
     </select>
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysNfcBind.java

@@ -89,9 +89,9 @@ public class SysNfcBind extends BaseEntity {
     private String collectionAreaName;
 
     /**
-     * t_area_check 主键id
+     * sys_area_check 主键id
      */
-    @ApiModelProperty(value = "t_area_check 主键id")
+    @ApiModelProperty(value = "sys_area_check 主键id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long checkId;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -348,6 +348,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         userPostMapper.deleteUserPostByUserId(userId);
         // 新增用户与岗位管理
         insertUserPost(user);
+        user.setPassword(null);
+        user.setSalt(null);
         return userMapper.updateById(user);
     }