Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -300,7 +300,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreDrillTask.setCreateTime(new Date());
             coreDrillTask.setStartDate(DateUtil.beginOfDay(new Date()));
-            coreDrillTask.setEndDate(DateUtil.endOfDay(new Date()));
+            // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
+            Long endTime= coreDrillTask.getStartDate().getTime();
+            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            coreDrillTask.setEndDate(end);
         }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());

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

@@ -276,7 +276,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request, task);
         task.setStartDate(DateUtil.beginOfDay(new Date()));
-        task.setEndDate(DateUtil.endOfDay(new Date()));
+        Long endTime= (new Date()).getTime();
+        task.setEndDate(DateUtil.endOfDay(new Date(endTime+7*24*60*60*1000-1000)));
+//        task.setEndDate(DateUtil.endOfDay(new Date()));
+
         task.setCreateTime(DateUtils.getNowDate());
         task.setUpdateTime(DateUtils.getNowDate());
         task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
@@ -323,8 +326,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTask.setOrgName(sysOrg.getShortName());
             coreEduTrainingTask.setOrgPath(sysOrg.getPath());
             coreEduTrainingTask.setTitle(request.getTitle());
-            coreEduTrainingTask.setStartDate(DateUtils.toDate(request.getTrainingStartDateTime()));
-            coreEduTrainingTask.setEndDate(DateUtils.toDate(request.getTrainingEndDateTime()));
+            coreEduTrainingTask.setStartDate(DateUtil.beginOfDay(new Date()));
+            // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
+            Long endTime=coreEduTrainingTask.getStartDate().getTime();
+            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            coreEduTrainingTask.setEndDate(end);
+//            coreEduTrainingTask.setEndDate(DateUtils.toDate(request.getTrainingEndDateTime()));
+
+
             coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
             coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
             coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());

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

@@ -4,11 +4,8 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateHelper;
@@ -23,20 +20,14 @@ import com.xunmei.core.resumption.enums.ResumptionStatus;
 import com.xunmei.core.resumption.gx.vo.*;
 import com.xunmei.core.resumption.mapper.*;
 import com.xunmei.core.resumption.service.AppPlanService;
-import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
-import sun.nio.ch.ThreadPool;
 
-import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -288,11 +279,11 @@ public class ResumptionServiceImpl implements ResumptionService {
     }
 
 
-    private void getTaskNfc(List<ResumptionPlanVo> resumptionPlanVos,List<ResumptionNFCVo> nfcs,Resumption resumption){
+    private List<ResumptionNFCVo> getTaskNfc(List<ResumptionPlanVo> resumptionPlanVos,List<ResumptionNFCVo> nfcs,Resumption resumption){
 
         if (ResumptionStatus.COMPLETED.getCode().equals(resumption.getStatus())) {
             //已提交的只显示nfc扫描的记录
-            nfcs = nfcs.stream().filter(n -> n.getStatus() == 1).collect(Collectors.toList());
+            nfcs = nfcs.stream().filter(n -> n.getStatus() != null && n.getStatus() == 1).collect(Collectors.toList());
         }
         if(ResumptionStatus.PROGRESS.getCode().equals(resumption.getStatus())){
             //已保存时，只显示保存后的记录
@@ -320,6 +311,7 @@ public class ResumptionServiceImpl implements ResumptionService {
             }
 
             for (ResumptionNFCVo nfc : nfcs) {
+                nfc.setStatus(0);
                 if(areaIds.contains(nfc.getAreaId())){
                     news.add(nfc);
                 }
@@ -330,8 +322,8 @@ public class ResumptionServiceImpl implements ResumptionService {
             }
             nfcs.clear();;
             nfcs.addAll(news);
-
         }
+        return nfcs;
     }
 
 
@@ -361,7 +353,7 @@ public class ResumptionServiceImpl implements ResumptionService {
          * 获取 机构下所有nfc数据
          */
         List<ResumptionNFCVo> nfcs = resumptionMapper.selectNFCOfOrg(resumption.getId(), resumption.getOrgId());
-        getTaskNfc(resumptionPlanVos,nfcs,resumption);
+        nfcs = getTaskNfc(resumptionPlanVos,nfcs,resumption);
 
         /**
          * nfc按区域分组，并统计已扫描和未扫描的数量

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

@@ -45,7 +45,7 @@ public class ResumptionNFCVo {
     /**
      * 扫描状态
      */
-    private Integer status = 0;
+    private Integer status;
 
     /**
      * 扫描方法