Merge remote-tracking branch 'origin/V0.1.0' into V0.1.0

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SafeCheckTaskRegisterBookVo.java

@@ -54,5 +54,11 @@ public class SafeCheckTaskRegisterBookVo {
 
   private String signImg;
 
+  @ApiModelProperty("检查开始时间 eg: 2000年1月2日 15时23分")
+  private String startTimeStr;
+
+  @ApiModelProperty("检查结束时间 eg: 2000年1月2日 15时23分")
+  private String endTimeStr;
+
 
 }

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

@@ -1050,9 +1050,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         SafeCheckTaskRegisterBookVo registerBookVo = new SafeCheckTaskRegisterBookVo();
         registerBookVo.setSignImg(getFileRealPath(appSafetyCheckTask.getSignImg(), prefixPath, staticsPath));
         registerBookVo.setTaskTitle(appSafetyCheckTask.getTitle() /*+ getRegisterBookCycleText(Math.toIntExact(appSafetyCheckTask.getCheckCycle()), appSafetyCheckTask.getSubmitTime())*/);
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
         String dateStr = format.format(appSafetyCheckTask.getSubmitTime());
         registerBookVo.setDateStr(dateStr);
+        registerBookVo.setStartTimeStr(format.format(appSafetyCheckTask.getStartTime()));
+        registerBookVo.setEndTimeStr(format.format(appSafetyCheckTask.getEndTime()));
         registerBookVo.setCheckOrgId(appSafetyCheckTask.getCheckOrgId());
         registerBookVo.setCheckOrgName(appSafetyCheckTask.getCheckOrgName());
         registerBookVo.setOrgId(appSafetyCheckTask.getOrgId());

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

@@ -415,7 +415,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());
+        data.setSubmitTime(DateUtils.getNowDate());
         return webSubmit(data, true);
     }
 
@@ -612,6 +612,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 .set(CoreSafetyTask::getSubmitBy, SecurityUtils.getLoginUser().getName())
                 .set(CoreSafetyTask::getExceptionCount, exceptionCount)
                 .set(CoreSafetyTask::getSignImg, data.getSignImg())
+                .set(CoreSafetyTask::getStartTime, data.getStartTime())
+                .set(CoreSafetyTask::getEndTime, data.getEndTime())
                 .set(CoreSafetyTask::getCheckTeam, data.getCheckTeam());
         if (ObjectUtil.equal(isSubmit, 1) && ObjectUtil.notEqual(SecurityUtils.getUserId(), data.getGrantUserId())) {
             //不是被授权人完成的该任务，则清空被授权人信息
@@ -648,8 +650,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         task.setRoleId(((IdNameVo) data.getCheckRoles().get(0)).getId());
         task.setPlanStartTime(data.getPlanStartTime());
         task.setPlanEndTime(data.getPlanEndTime());
-        task.setStartTime(new Date());
-        task.setEndTime(new Date());
+        task.setStartTime(data.getStartTime());
+        task.setEndTime(data.getEndTime());
         Ymd ymd = Ymd.of(data.getYmdDate());
         task.setYmdDate(ymd.getDate());
         task.setYmdDay(ymd.getDay().longValue());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -93,6 +93,14 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "签名图片")
     private String signImg;
 
+    @ApiModelProperty(value = "检查开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty(value = "检查结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
     public static TaskRegisterVo of(CoreSafetyTask task, SysOrg beCheckedOrg, List<IdNameVo> checkRoles, int inRegisterTime) {
         TaskRegisterVo vo = new TaskRegisterVo();
         vo.setId(task.getId());
@@ -114,6 +122,8 @@ public class TaskRegisterVo<T> {
         vo.setExceptionCount(task.getExceptionCount().intValue());
         vo.setSubmitBy(task.getSubmitBy());
         vo.setSignImg(task.getSignImg());
+        vo.setStartTime(task.getStartTime());
+        vo.setEndTime(task.getEndTime());
 
         vo.setInRegisterTime(inRegisterTime);
 

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -658,14 +658,17 @@ public class PdfUtil {
             tableFont, SafeCheckTaskRegisterBookVo data) throws Exception {
         PdfUtil.createPDFCell(tableFont, table, "被查单位", Element.ALIGN_MIDDLE, 3, 1);
         PdfUtil.createPDFCell(tableFont, table, data.getOrgName(), Element.ALIGN_MIDDLE, 4, 1);
-        PdfUtil.createPDFCell(tableFont, table, "检查日期", Element.ALIGN_MIDDLE, 3, 1);
-        PdfUtil.createPDFCell(tableFont, table, data.getDateStr(), Element.ALIGN_MIDDLE, 4, 1);
-
-        PdfUtil.createPDFCell(tableFont, table, "检查类型", Element.ALIGN_MIDDLE, 3, 1);
-        PdfUtil.createPDFCell(tableFont, table, data.getCheckTypeText(), Element.ALIGN_MIDDLE, 4, 1);
         PdfUtil.createPDFCell(tableFont, table, "检查名称", Element.ALIGN_MIDDLE, 3, 1);
         PdfUtil.createPDFCell(tableFont, table, data.getTaskTitle(), Element.ALIGN_MIDDLE, 4, 1);
 
+        PdfUtil.createPDFCell(tableFont, table, "检查类型", Element.ALIGN_MIDDLE, 3, 1);
+        PdfUtil.createPDFCell(tableFont, table, data.getCheckTypeText(), Element.ALIGN_MIDDLE, 11, 1);
+
+        PdfUtil.createPDFCell(tableFont, table, "检查开始时间", Element.ALIGN_MIDDLE, 3, 1);
+        PdfUtil.createPDFCell(tableFont, table, data.getStartTimeStr(), Element.ALIGN_MIDDLE, 4, 1);
+        PdfUtil.createPDFCell(tableFont, table, "检查结束时间", Element.ALIGN_MIDDLE, 3, 1);
+        PdfUtil.createPDFCell(tableFont, table, data.getEndTimeStr(), Element.ALIGN_MIDDLE, 4, 1);
+
         PdfUtil.createPDFCell(tableFont, table, "检查单位", Element.ALIGN_MIDDLE, 3, 1);
         PdfUtil.createPDFCell(tableFont, table, data.getCheckOrgName(), Element.ALIGN_MIDDLE, 4, 1);
         PdfUtil.createPDFCell(tableFont, table, "检查组成员", Element.ALIGN_MIDDLE, 3, 1);

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1074,7 +1074,7 @@ and
           and b.is_lock = 0
           AND c.check_type =3
           and a.org_path LIKE concat(#{orgPath}, '%')
-          AND a.submit_time BETWEEN #{startTime} and #{endTime}
+          AND a.start_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="getEduNumber" resultType="java.lang.Integer">
         SELECT