履职任务id改为Long

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

@@ -40,7 +40,7 @@ public class AppResumptionData extends Model<AppResumptionData> implements Seria
     /**
      * 任务id
      */
-    private String resumptionId;
+    private Long resumptionId;
     /**
      * 正常不正常，通过不通过，合格不合格
      */

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

@@ -32,7 +32,7 @@ public class AppResumptionDataNfc extends Model<AppResumptionDataNfc> implements
     /**
      * 履职任务id
      */
-    private String resumptionId;
+    private Long resumptionId;
     /**
      * NFC标签id(实际是采集点id，checkid)
      */

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

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.utils.FormType;
 import com.xunmei.common.core.utils.ResumptionStatus;
@@ -32,21 +33,21 @@ public class Resumption extends BaseEntity {
 
     private static Logger log = LoggerFactory.getLogger(Resumption.class);
 
-    public static Resumption of(final Long orgId, final ResumptionType type, final FormType formType, final Ymd ymd) {
-        // 判断时间是否过期, 如果过期就显示未提交
-        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
-
-        //
-        return Resumption.builder()
-                         .id(type.toId(formType, ymd.getDate(), orgId))
-//                         .status(status)
-                         .orgId(orgId)
-//                         .type(type)
-//                         .formType(formType)
-                         .exceptionCount(0)
-                         .ymd(ymd)
-                         .build();
-    }
+//    public static Resumption of(final Long orgId, final ResumptionType type, final FormType formType, final Ymd ymd) {
+//        // 判断时间是否过期, 如果过期就显示未提交
+//        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
+//
+//        //
+//        return Resumption.builder()
+//                         .id(type.toId(formType, ymd.getDate(), orgId))
+////                         .status(status)
+//                         .orgId(orgId)
+////                         .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) {
 //        // 判断时间是否过期, 如果过期就显示未提交
@@ -67,7 +68,8 @@ public class Resumption extends BaseEntity {
     /**
      * 编号
      */
-    private String id;
+    @TableId
+    private Long id;
 
     /**
      * 任务名称
@@ -141,9 +143,9 @@ public class Resumption extends BaseEntity {
     public Resumption() {
     }
 
-    public Resumption(final String id) {
-        this.id = id;
-    }
+//    public Resumption(final String id) {
+//        this.id = id;
+//    }
 
 
     /**

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

@@ -22,7 +22,7 @@ public class ResumptionTaskDataDto {
 
     @ApiModelProperty(value = "履职任务id")
     @NotBlank(message = "请填写履职任务id")
-    private String taskid;
+    private Long taskid;
     private int type;
     @ApiModelProperty(value = "日期")
     @NotNull(message = "请填写日期")

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

@@ -18,7 +18,7 @@ import java.util.Date;
 public class TaskDetailsDto {
     @ApiModelProperty(value = "任务id")
     @NotBlank(message = "请填写任务id")
-    private String taskId;
+    private Long taskId;
     private int type;
     @ApiModelProperty(value = "日期")
     @NotNull(message = "请填写日期")

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

@@ -29,7 +29,7 @@ public interface AppResumptionDataMapper extends BaseMapper<AppResumptionData> {
     List<Map<String, Object>> findTaskDataListNew(String taskid);
 
     List<Map<String, Object>> findCheckDataListNew(String taskid);
-    List<ResumptionInfoVo> findDataByTaskId(@Param("taskId") String taskId);
+    List<ResumptionInfoVo> findDataByTaskId(@Param("taskId") Long taskId);
 
     List<AppResumptionData> findDataByPointBusinessType(Map<String, Object> map);
 

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

@@ -21,8 +21,8 @@ public interface ResumptionMapper extends BaseMapper<Resumption> {
 
     List<Map<String, Object>> findYearTaskList(@Param("year")int year,@Param("type") int type,@Param("roleId") Long roleId, @Param("orgid")Long orgid,@Param("quarter") int quarter);
 
-    Resumption findOneByTaskIdAndDate(@Param("taskId")String taskId,@Param("year") int year, @Param("quarter")int quarter);
-    List<Map<String, Object>> findOneByTaskId(@Param("taskId")String taskId,@Param("year")int year,@Param("quarter")int quarter);
+    Resumption findOneByTaskIdAndDate(@Param("taskId")Long taskId,@Param("year") int year, @Param("quarter")int quarter);
+    List<Map<String, Object>> findOneByTaskId(@Param("taskId")Long taskId,@Param("year")int year,@Param("quarter")int quarter);
 
     void updateResumption(@Param("resumption") Resumption resumption);
 

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

@@ -19,15 +19,15 @@ import java.util.Set;
  */
 public interface AppResumptionDataNfcService extends IService<AppResumptionDataNfc> {
 
-    List<Map<String, Object>> findnfcDataList(String taskid, Long areaid,Long orgId);
+    List<Map<String, Object>> findnfcDataList(Long taskid, Long areaid,Long orgId);
 
-    List<Map<String, Object>> findnfcDataListByPointid(Long pointid,String taskid,Long orgId);
+    List<Map<String, Object>> findnfcDataListByPointid(Long pointid,Long taskid,Long orgId);
 
-    List<Map<String, Object>> findnfcDataListNew(String taskid, Long orgId);
+    List<Map<String, Object>> findnfcDataListNew(Long taskid, Long orgId);
 
-    List<Map<String, Object>> findnfcDataListByPointidNew(String taskid, Long orgId);
+    List<Map<String, Object>> findnfcDataListByPointidNew(Long taskid, Long orgId);
 
-    List<ResumptionNfcInfoVo> findPointNfcData(String taskid, Long orgId);
+    List<ResumptionNfcInfoVo> findPointNfcData(Long taskid, Long orgId);
 
     List<ResumptionNfcVo> findNfcByAreaIdAndOrgId(Set<Long> nfcBindIdList, Long orgId, Long planId);
 }

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

@@ -28,7 +28,7 @@ public interface AppResumptionDataService extends IService<AppResumptionData> {
 
     List<Map<String, Object>> findCheckDataListNew(String taskid);
 
-    List<ResumptionInfoVo> findDataByTaskId(String taskId);
+    List<ResumptionInfoVo> findDataByTaskId(Long taskId);
 
     /**
      *

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

@@ -308,7 +308,7 @@ public Date LocalDateTimeToDate(LocalDateTime localDateTime){
         //根据计划id 关联要点，获取区域列表
         //Resumption resumption = resumptionService.find(taskid);
         Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
-        String taskid = request.getTaskId();
+        Long 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()));

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

@@ -27,7 +27,7 @@ import java.util.Set;
 @Service
 public class AppResumptionDataNfcServiceImpl extends ServiceImpl<AppResumptionDataNfcMapper, AppResumptionDataNfc> implements AppResumptionDataNfcService {
     @Override
-    public List<Map<String, Object>> findnfcDataList(String taskid, Long areaid,Long orgId) {
+    public List<Map<String, Object>> findnfcDataList(Long taskid, Long areaid,Long orgId) {
         Map<String,Object> parmar = new HashMap<>();
         parmar.put("taskid",taskid);
         parmar.put("areaid",areaid);
@@ -36,7 +36,7 @@ public class AppResumptionDataNfcServiceImpl extends ServiceImpl<AppResumptionDa
     }
 
     @Override
-    public List<Map<String, Object>> findnfcDataListByPointid(Long pointid, String taskid, Long orgId) {
+    public List<Map<String, Object>> findnfcDataListByPointid(Long pointid, Long taskid, Long orgId) {
         Map<String,Object> parmar = new HashMap<>();
         parmar.put("pointid",pointid);
         parmar.put("taskid",taskid);
@@ -45,7 +45,7 @@ public class AppResumptionDataNfcServiceImpl extends ServiceImpl<AppResumptionDa
     }
 
     @Override
-    public List<Map<String, Object>> findnfcDataListNew(String taskid, Long orgId) {
+    public List<Map<String, Object>> findnfcDataListNew(Long taskid, Long orgId) {
         Map<String,Object> parmar = new HashMap<>();
         parmar.put("taskid",taskid);
         parmar.put("orgId",orgId);
@@ -53,7 +53,7 @@ public class AppResumptionDataNfcServiceImpl extends ServiceImpl<AppResumptionDa
     }
 
     @Override
-    public List<Map<String, Object>> findnfcDataListByPointidNew(String taskid, Long orgId) {
+    public List<Map<String, Object>> findnfcDataListByPointidNew(Long taskid, Long orgId) {
         Map<String,Object> parmar = new HashMap<>();
         parmar.put("taskid",taskid);
         parmar.put("orgId",orgId);
@@ -61,7 +61,7 @@ public class AppResumptionDataNfcServiceImpl extends ServiceImpl<AppResumptionDa
     }
 
     @Override
-    public List<ResumptionNfcInfoVo> findPointNfcData(String taskid, Long orgId) {
+    public List<ResumptionNfcInfoVo> findPointNfcData(Long taskid, Long orgId) {
         Map<String,Object> parmar = new HashMap<>();
         parmar.put("taskid",taskid);
         parmar.put("orgId",orgId);

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

@@ -60,7 +60,7 @@ public class AppResumptionDataServiceImpl extends ServiceImpl<AppResumptionDataM
     }
 
     @Override
-    public List<ResumptionInfoVo> findDataByTaskId(String taskId) {
+    public List<ResumptionInfoVo> findDataByTaskId(Long taskId) {
         return baseMapper.findDataByTaskId(taskId);
     }
 

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

@@ -229,7 +229,7 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
             }
         }*/
 
-        List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
+//        List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
         List<IdNameVo> orgNames = orgService.getParentName(list.stream().map(i -> i.getOrgId()).distinct().collect(Collectors.toList()));
         List<IdNameVo> roleNames= roleService.getNames(RoleConditionEto
                 .builder()
@@ -243,10 +243,10 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
                 vo.setOrgName(org.get().getName());
                 vo.setParentOrgName(org.get().getExtra());
             }
-            Optional<IdNameVo> plan=planList.stream().filter(i -> ObjectUtil.equal(vo.getPlanId(), i.getId())).findFirst();
-            if (plan.isPresent()) {
-                vo.setPlanName(plan.get().getName());
-            }
+//            Optional<IdNameVo> plan=planList.stream().filter(i -> ObjectUtil.equal(vo.getPlanId(), i.getId())).findFirst();
+//            if (plan.isPresent()) {
+//                vo.setPlanName(plan.get().getName());
+//            }
 
             Optional<IdNameVo>  role = roleNames.stream().filter(r -> r.getId().equals(vo.getRoleId())).findFirst();
             if (role.isPresent()) {

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

@@ -18,10 +18,7 @@ public class ResumptionRecordPageVo {
     private String resumptionId;
 
     /**任务名称*/
-    private String taskName;
-
-    @ApiModelProperty("计划名称")
-    private String planName;
+    private String name;
 
     @ApiModelProperty("计划id")
     private Long planId;

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

@@ -111,9 +111,10 @@
         select r.id as resumptionId,r.exception_count as abnormalDataNums,
         <!--p.plan_name as time,
         p.plan_name as planName,-->
+        r.name,
         r.plan_id as planId,
         <!--        p.plan_exec as planExec,-->
-        r.ymd_date as ymdDate,
+        r.ymd_date as ymd,
         r.status as status,
         r.role_id as roleId,
         <!--o.name as orgName ,-->