履职重新生成完善；履职情况跟踪查询优化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/TaskCreatingServiceImplBase.java

@@ -359,7 +359,7 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
 
                 if (dateField == DateField.DAY_OF_YEAR) {
                     segEnd = DateUtil.offset(nextStart, DateField.SECOND, -1);
-                    segEnd.setField(DateField.HOUR, 23).setField(DateField.MINUTE, 59).setField(DateField.SECOND, 59);
+                    segEnd.setField(DateField.HOUR_OF_DAY, 23).setField(DateField.MINUTE, 59).setField(DateField.SECOND, 59);
                 }
                 if (segEnd.after(end)) {
                     segEnd = new DateTime(end);

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

@@ -112,8 +112,8 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         if (ObjectUtil.isNotNull(pageDto.getRange()) && pageDto.getRange().length==2 && ObjectUtil.isAllNotEmpty(pageDto.getRange()[0], pageDto.getRange()[1])) {
             isTime = Boolean.TRUE;
             Date[] range = pageDto.getRange();
-            Date startDate = DateUtil.date(range[0]);
-            Date endDate = DateUtil.date(range[1]);
+            Date startDate = DateUtil.beginOfDay(range[0]);
+            Date endDate = DateUtil.endOfDay(range[1]);
             Calendar startCalendar = Calendar.getInstance();
             Calendar endCalendar = Calendar.getInstance();
             startCalendar.setTime(startDate);
@@ -132,8 +132,8 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
             }
             hashMap.put("startYear", startYear);
             hashMap.put("endYear", endYear);
-            hashMap.put("startDate", DateUtil.formatDate(startDate));
-            hashMap.put("endDate", DateUtil.formatDate(endDate));
+            hashMap.put("startDate", DateUtil.format(startDate,"yyyy-MM-dd HH:mm:ss"));
+            hashMap.put("endDate", DateUtil.format(endDate,"yyyy-MM-dd HH:mm:ss"));
 //            switch (pageDto.getExecuteCycle()) {
 //                case 1:
 //                case 2:

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -186,7 +186,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         CycleCommonEnum cycle = CycleCommonEnum.getEnum(plan.getPlanCycle());
         DateRange range = DateUtils.getStartAndEnd(workDate, cycle);
 
-        List<Resumption> resumptionList = queryTask(range.getStartTime(), cycle, null, appPlans.stream().map(AppPlan::getId).collect(Collectors.toList()));
+        List<Resumption> resumptionList = queryTask(range.getStartTime(),range.getEndTime(), cycle, null, appPlans.stream().map(AppPlan::getId).collect(Collectors.toList()));
         List<Long> deleteIds = resumptionList.stream()
                 .filter(r -> (ObjectUtil.equal(r.getStatus(), 1) || ObjectUtil.equal(r.getStatus(), 2)))
                 .map(Resumption::getId).collect(Collectors.toList());
@@ -290,7 +290,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
      */
     @Transactional
     public void rebuildTask(List<Long> orgIds, Date startDate, Date endDate, CycleCommonEnum cycle, SysWorkTime workTime) {
-        List<Resumption> resumptionList = queryTask(startDate, cycle, orgIds, null);
+        List<Resumption> resumptionList = queryTask(startDate,endDate, cycle, orgIds, null);
         List<Long> deleteIds = resumptionList.stream()
                 .filter(r -> (ObjectUtil.equal(r.getStatus(), 1) || ObjectUtil.equal(r.getStatus(), 2)))
                 .map(Resumption::getId).collect(Collectors.toList());
@@ -447,9 +447,12 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         return resumptionList;
     }
 
-    private List<Resumption> queryTask(Date ymdDate, CycleCommonEnum cycle, List<Long> orgIds, List<Long> planIds) {
+    private List<Resumption> queryTask(Date startDate,Date endDate, CycleCommonEnum cycle, List<Long> orgIds, List<Long> planIds) {
         QueryWrapper<Resumption> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Resumption::getYmdDate, ymdDate);
+        Date start=DateUtil.beginOfDay(startDate);
+        Date end=DateUtil.endOfDay(endDate);
+        queryWrapper.lambda().le(Resumption::getYmdDate, end);
+        queryWrapper.lambda().ge(Resumption::getYmdDate, start);
         if (CollectionUtils.isNotEmpty(orgIds)) {
             queryWrapper.lambda().in(Resumption::getOrgId, orgIds);
         }

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

@@ -402,7 +402,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         nfc.setSubmitTime(ObjectUtil.isNull(nfcVo.getSubmitTime()) ? new Date() : nfcVo.getSubmitTime());
         nfc.setPointId(point.getPointId());
         nfc.setScanMethod(nfcVo.getScanMethod());
-        nfc.setImg(nfc.getImg());
+        nfc.setImg(nfcVo.getImg());
 
         return nfc;
     }

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

@@ -143,11 +143,22 @@
 
             <if test="isTime==true">
                 and r.ymd_year between #{hashMap.startYear} and #{hashMap.endYear}
-                and r.ymd_date between #{hashMap.startDate} and #{hashMap.endDate}
                 and r.ymd_quarter in
                 <foreach collection="ymdQuarters" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                and ((
+                #{hashMap.startDate}  &lt;= r.plan_start_time
+                and #{hashMap.endDate} >= r.plan_start_time
+                )
+                or (
+                #{hashMap.startDate}   &lt;= r.plan_end_time
+                and #{hashMap.endDate} >= r.plan_end_time
+                )
+                or (
+                #{hashMap.startDate} >= r.plan_start_time
+                and #{hashMap.endDate} &lt;=  r.plan_end_time
+                ))
             </if>
             <if test="pageDto.status !=null ">
                 and r.status = #{pageDto.status}