Merge remote-tracking branch 'remotes/origin/V0.0.5' into V0.0.6

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

@@ -38,6 +38,7 @@ import java.util.List;
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
     private static final String ONE = "1";
     private static final String TWO = "2";
+    private static final String ZERO = "0";
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
     @Autowired
@@ -92,12 +93,13 @@ private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
                 throw new ServiceException("请扫描本机构NFC");
             }
         }
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
         //jiaoyan
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("task_id", coreMonitoringTaskRegistration.getTaskId());
         queryWrapper.eq("del_flag", 0);
         List<CoreMonitoringTaskRegistration> list = baseMapper.selectList(queryWrapper);
-        if (CollectionUtils.isNotEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list) && !coreMonitoringRetrievalTask.getStatus().equals(ZERO)) {
             if (StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndNfc()) && StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndPicture())) {
                 throw new ServiceException("请勿重复扫描");
             }
@@ -109,12 +111,15 @@ private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
             coreMonitoringTaskRegistration1.setAverageDuration(Double.valueOf(String.format("%.2f", avg)));
             return baseMapper.updateById(coreMonitoringTaskRegistration1);
         } else {
+            if(coreMonitoringRetrievalTask.getStatus().equals(ZERO)){
+                coreMonitoringTaskRegistrationMapper.deleteByTaskId(coreMonitoringTaskRegistration.getTaskId());
+            }
             coreMonitoringTaskRegistration.setCreateTime(DateUtils.getNowDate());
             coreMonitoringTaskRegistration.setTaskStartTime(DateUtils.getNowDate());
             coreMonitoringTaskRegistration.setDelFlag("0");
             coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
             //修改任务状态为进行中
-            CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+
             coreMonitoringRetrievalTask.setStatus(ONE);
             coreMonitoringRetrievalTask.setStartTime(DateUtils.getNowDate());
             coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -324,7 +324,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         questionVo.setShouldComplete(question.get().getTotal());
         questionVo.setCurrentCompletedCount(question.get().getCompleted());
         questionVo.setCurrentCompletedRate(NumberUtils.computeRate(questionVo.getShouldComplete(), questionVo.getCurrentCompletedCount()));
-
+        questionVo.setCompare(questionVo.getCurrentCompletedRate() - questionVo.getPrevCompletedRate());
         vo.getTaskInfo().put("问题整改", questionVo);
         return vo;
     }
@@ -589,7 +589,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
      */
     private AppOverviewItemVo computeGa38(int total, int completed, int currentCompleted, int prevCompleted) {
         AppOverviewItemVo vo = new AppOverviewItemVo();
-        vo.setShouldComplete(total);
+        vo.setShouldComplete(completed);
         vo.setCurrentCompletedRate(NumberUtils.computeRate(total, completed));
         vo.setPrevCompletedRate(NumberUtils.computeRate(total, prevCompleted));
         vo.setCompare(((float) currentCompleted) - prevCompleted);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/vo/app/AppOverviewItemVo.java

@@ -7,17 +7,17 @@ import lombok.Data;
 @Data
 public class AppOverviewItemVo {
     @ApiModelProperty("当前周期完成率，近90天整改率")
-    private Float currentCompletedRate;
+    private Float currentCompletedRate = 0F;
 
     @ApiModelProperty("当前周期应完成")
-    private Integer shouldComplete;
+    private Integer shouldComplete = 0;
 
     @ApiModelProperty("当前周期完成数，已整改")
-    private Integer currentCompletedCount;
+    private Integer currentCompletedCount = 0;
 
     @ApiModelProperty("上一周期完成率，")
-    private Float prevCompletedRate;
+    private Float prevCompletedRate = 0F;
 
     @ApiModelProperty("本周期与上一周期的比")
-    private  Float compare;
+    private  Float compare = 0F;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -192,7 +192,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      *
      * @return
      */
-    @InnerAuth
+//    @InnerAuth
     @GetMapping("/initializationAccessTask")
     public AjaxResult initializationAccessTask() {
         try {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskBuilderServiceImpl.java

@@ -238,13 +238,14 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
     public void initializationTask() {
         LocalDate today = LocalDate.now();
         LocalDate yesterday = today.minusDays(1);
-        //初始化任务
-        coreMonitoringRetrievalTaskMapper.initializationTask(yesterday.toString());
-        List<Long> longs = coreMonitoringRetrievalTaskMapper.selectTaskByTime(yesterday.toString());
+        List<Long> longs = coreMonitoringRetrievalTaskMapper.selectTaskByTime(today.toString());
         //删除关联
         longs.forEach(l -> {
             coreMonitoringTaskRegistrationMapper.deleteByTaskId(l);
         });
+        //初始化任务
+        coreMonitoringRetrievalTaskMapper.initializationTask(today.toString());
+
     }
 
     @Override

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

@@ -414,6 +414,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
         data.setPlanEndTime(DateUtil.endOfDay(data.getPlanStartTime()).setField(DateField.MILLISECOND, 0));
         data.setPlanStartTime(DateUtil.beginOfDay(data.getPlanStartTime()));
+        data.setSubmitTime(data.getPlanStartTime());
         return webSubmit(data, true);
     }
 
@@ -428,7 +429,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("任务未到开始时间");
         }
 
-        if (DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
+        if (!isNewTask && DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
             throw new ServiceException("任务已过结束时间");
         }
 
@@ -641,7 +642,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         task.setYmdWeek(ymd.getWeek().longValue());
         task.setYmdYear(ymd.getYear().longValue());
         task.setYmdHalfyear(ymd.getHalfyear().longValue());
-        task.setSubmitTime(new Date());
+        task.setSubmitTime(data.getPlanStartTime());
         task.setSubmitorId(SecurityUtils.getUserId());
         task.setSubmitBy(SecurityUtils.getLoginUser().getName());
 

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

@@ -234,13 +234,14 @@
                a.`code`     as nfc_code,
                b.`status`,
                b.scan_method,
+               b.submit_time,
                b.img
         FROM (SELECT area_id, check_id, collection_area_name, CODE, id, label_name
               FROM sys_nfc_bind
               WHERE org_id = #{orgId}
                 and del_flag = '0'
                 and enable = '0') a
-                 LEFT JOIN (SELECT nfc_id, point_id, img, STATUS, scan_method
+                 LEFT JOIN (SELECT nfc_id, point_id, img, STATUS, scan_method,submit_time
                             FROM core_resumption_data_nfc
                             WHERE resumption_id = #{resumptionId}) b ON a.id = b.nfc_id
                  left join sys_area ar on ar.id = a.area_id and ar.del_flag = '0'

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -630,7 +630,7 @@
         SET `status`=0,
             start_time=null
         WHERE `status` = 1
-          AND start_time LIKE concat(#{dateTime}, '%')
+          and start_time < STR_TO_DATE(#{dateTime},'%Y-%m-%d')
     </update>
     <update id="initializationTaskByHand">
         update core_monitoring_retrieval_task
@@ -679,7 +679,7 @@
         SELECT *
         FROM core_monitoring_retrieval_task
         WHERE `status` = 1
-          AND start_time LIKE concat(#{dateTime}, '%')
+          and start_time &lt; STR_TO_DATE(#{dateTime},'%Y-%m-%d')
     </select>
 
     <select id="selectMonitorOverTimeExceptionData"

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

@@ -116,6 +116,7 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
     @Override
     public int insertSysOrgExtend(SysOrgExtend sysOrgExtend) {
         sysOrgExtend.setCreateTime(DateUtils.getNowDate());
+        sysOrgExtendMapper.delete(new LambdaQueryWrapper<SysOrgExtend>().eq(SysOrgExtend::getOrgId,sysOrgExtend.getOrgId()));
         return sysOrgExtendMapper.insert(sysOrgExtend);
     }
 
@@ -198,7 +199,9 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
     @Override
     public int updateSysOrgExtend(SysOrgExtend sysOrgExtend) {
         sysOrgExtend.setUpdateTime(DateUtils.getNowDate());
-        return sysOrgExtendMapper.updateById(sysOrgExtend);
+        sysOrgExtendMapper.delete(new LambdaQueryWrapper<SysOrgExtend>().eq(SysOrgExtend::getOrgId,sysOrgExtend.getOrgId()));
+        sysOrgExtend.setId(null);
+        return sysOrgExtendMapper.insert(sysOrgExtend);
     }
 
     /**