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

sop-business/src/main/java/com/qmth/sop/business/bean/dto/DingSubmitExportDto.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 @HeadStyle(fillForegroundColor = 11)
 @HeadFontStyle(color = 1)
 public class DingSubmitExportDto {
+
     @ExcelProperty(value = "服务单元")
     @ApiModelProperty(value = "服务单元")
     private String serviceUnitName;
@@ -35,13 +36,21 @@ public class DingSubmitExportDto {
     @ApiModelProperty(value = "城市")
     private String city;
 
-    @ExcelProperty(value = "进场时间")
-    @ApiModelProperty(value = "进场时间")
-    private String approachTime;
+    @ExcelProperty(value = "扫描开始时间")
+    @ApiModelProperty(value = "扫描开始时间")
+    private String scanStartTime;
+
+    @ExcelProperty(value = "扫描结束时间")
+    @ApiModelProperty(value = "扫描结束时间")
+    private String scanEndTime;
+
+    @ExcelProperty(value = "阅卷开始时间")
+    @ApiModelProperty(value = "阅卷开始时间")
+    private String markPaperStartTime;
 
-    @ExcelProperty(value = "撤场时间")
-    @ApiModelProperty(value = "撤场时间")
-    private String departureTime;
+    @ExcelProperty(value = "阅卷结束时间")
+    @ApiModelProperty(value = "阅卷结束时间")
+    private String markPaperEndTime;
 
     @ExcelProperty(value = "姓名（人员档案号）")
     @ApiModelProperty(value = "姓名（人员档案号）")
@@ -143,20 +152,36 @@ public class DingSubmitExportDto {
         this.city = city;
     }
 
-    public String getApproachTime() {
-        return approachTime;
+    public String getScanStartTime() {
+        return scanStartTime;
+    }
+
+    public void setScanStartTime(String scanStartTime) {
+        this.scanStartTime = scanStartTime;
+    }
+
+    public String getScanEndTime() {
+        return scanEndTime;
+    }
+
+    public void setScanEndTime(String scanEndTime) {
+        this.scanEndTime = scanEndTime;
+    }
+
+    public String getMarkPaperStartTime() {
+        return markPaperStartTime;
     }
 
-    public void setApproachTime(String approachTime) {
-        this.approachTime = approachTime;
+    public void setMarkPaperStartTime(String markPaperStartTime) {
+        this.markPaperStartTime = markPaperStartTime;
     }
 
-    public String getDepartureTime() {
-        return departureTime;
+    public String getMarkPaperEndTime() {
+        return markPaperEndTime;
     }
 
-    public void setDepartureTime(String departureTime) {
-        this.departureTime = departureTime;
+    public void setMarkPaperEndTime(String markPaperEndTime) {
+        this.markPaperEndTime = markPaperEndTime;
     }
 
     public String getArchivesInfo() {

sop-business/src/main/java/com/qmth/sop/business/bean/result/CrmBindResult.java

@@ -1,5 +1,7 @@
 package com.qmth.sop.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.enums.RegionManagerSelectedTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -16,6 +18,7 @@ public class CrmBindResult {
     private RegionManagerSelectedTypeEnum leadType;
 
     @ApiModelProperty("大区经理")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long leadId;
 
     @ApiModelProperty("大区经理名称")

sop-business/src/main/java/com/qmth/sop/business/bean/result/DingSubmitResult.java

@@ -34,11 +34,17 @@ public class DingSubmitResult {
     @ApiModelProperty(value = "城市")
     private String city;
 
-    @ApiModelProperty(value = "进场时间")
-    private Long approachTime;
+    @ApiModelProperty(value = "扫描开始时间")
+    private Long scanStartTime;
 
-    @ApiModelProperty(value = "撤场时间")
-    private Long departureTime;
+    @ApiModelProperty(value = "扫描结束时间")
+    private Long scanEndTime;
+
+    @ApiModelProperty(value = "阅卷开始时间")
+    private Long markPaperStartTime;
+
+    @ApiModelProperty(value = "阅卷开始时间")
+    private Long markPaperEndTime;
 
     @ApiModelProperty(value = "用户id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -179,20 +185,36 @@ public class DingSubmitResult {
         this.city = city;
     }
 
-    public Long getApproachTime() {
-        return approachTime;
+    public Long getScanStartTime() {
+        return scanStartTime;
+    }
+
+    public void setScanStartTime(Long scanStartTime) {
+        this.scanStartTime = scanStartTime;
+    }
+
+    public Long getScanEndTime() {
+        return scanEndTime;
+    }
+
+    public void setScanEndTime(Long scanEndTime) {
+        this.scanEndTime = scanEndTime;
+    }
+
+    public Long getMarkPaperStartTime() {
+        return markPaperStartTime;
     }
 
-    public void setApproachTime(Long approachTime) {
-        this.approachTime = approachTime;
+    public void setMarkPaperStartTime(Long markPaperStartTime) {
+        this.markPaperStartTime = markPaperStartTime;
     }
 
-    public Long getDepartureTime() {
-        return departureTime;
+    public Long getMarkPaperEndTime() {
+        return markPaperEndTime;
     }
 
-    public void setDepartureTime(Long departureTime) {
-        this.departureTime = departureTime;
+    public void setMarkPaperEndTime(Long markPaperEndTime) {
+        this.markPaperEndTime = markPaperEndTime;
     }
 
     public Long getArchivesId() {

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDingSubmitQueryResult.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 @HeadStyle(fillForegroundColor = 11)
 @HeadFontStyle(color = 1)
 public class TBDingSubmitQueryResult implements Serializable {
+
     @ApiModelProperty(value = "考勤提交记录id")
     @JsonSerialize(using = ToStringSerializer.class)
     @ExcelIgnore
@@ -36,63 +37,89 @@ public class TBDingSubmitQueryResult implements Serializable {
     @ApiModelProperty(value = "服务单元")
     @ExcelProperty(value = "服务单元")
     private String service;
+
     @ApiModelProperty(value = "SOP流水号")
     @ExcelProperty(value = "SOP流水号")
     private String sopNo;
+
     @ApiModelProperty(value = "客户名称")
     @ExcelProperty(value = "客户名称")
     private String custom;
+
     @ApiModelProperty(value = "省份")
     @ExcelProperty(value = "省份")
     private String province;
+
     @ApiModelProperty(value = "城市")
     @ExcelProperty(value = "城市")
     private String city;
-    @ApiModelProperty(value = "项目开始时间")
-    @ExcelProperty(value = "项目开始时间",converter = LongLocalDateTimeConverter.class)
-    private Long examStartTime;
-    @ApiModelProperty(value = "项目结束时间")
-    @ExcelProperty(value = "项目结束时间",converter = LongLocalDateTimeConverter.class)
-    private Long examEndTime;
+
+    @ApiModelProperty(value = "扫描开始时间")
+    @ExcelProperty(value = "扫描开始时间", converter = LongLocalDateTimeConverter.class)
+    private Long scanStartTime;
+
+    @ApiModelProperty(value = "扫描结束时间")
+    @ExcelProperty(value = "扫描结束时间", converter = LongLocalDateTimeConverter.class)
+    private Long scanEndTime;
+
+    @ApiModelProperty(value = "阅卷开始时间")
+    @ExcelProperty(value = "阅卷开始时间", converter = LongLocalDateTimeConverter.class)
+    private Long markPaperStartTime;
+
+    @ApiModelProperty(value = "阅卷结束时间")
+    @ExcelProperty(value = "阅卷结束时间", converter = LongLocalDateTimeConverter.class)
+    private Long markPaperEndTime;
+
     @ApiModelProperty(value = "姓名")
     @ExcelProperty(value = "姓名")
     private String userName;
+
     @ApiModelProperty(value = "人员档案号")
     @ExcelProperty(value = "人员档案号")
     private String userNo;
+
     @ApiModelProperty(value = "项目角色")
     @ExcelProperty(value = "项目角色")
     private String roleName;
+
     @ApiModelProperty(value = "供应商")
     @ExcelProperty(value = "供应商")
     private String supplier;
+
     @ApiModelProperty(value = "实际出勤（天）")
     @ExcelProperty(value = "实际出勤（天）")
     private String attendance;
+
     @ApiModelProperty(value = "工作日（天）")
     @ExcelProperty(value = "工作日（天）")
     private String weekdays;
+
     @ApiModelProperty(value = "周末(天)")
     @ExcelProperty(value = "周末(天)")
     private String weekends;
+
     @ApiModelProperty(value = "法定节假日（天）")
     @ExcelProperty(value = "法定节假日（天）")
     private String holidays;
+
     @ApiModelProperty(value = "累计工时（小时）")
     @ExcelProperty(value = "累计工时（小时）")
     private String workHours;
+
     @ApiModelProperty(value = "违规工时（天）")
     @ExcelProperty(value = "违规工时（天）")
     private String violationDays;
+
     @ApiModelProperty(value = "提交人")
     @ExcelProperty(value = "提交人")
     private String submitter;
+
     @ApiModelProperty(value = "提交时间")
-    @ExcelProperty(value = "提交时间",converter = LongLocalDateTimeConverter.class)
+    @ExcelProperty(value = "提交时间", converter = LongLocalDateTimeConverter.class)
     private Long submissionTime;
-    @ApiModelProperty(value = "状态，START：已开始，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
-    @ExcelProperty(value = "提交状态",converter = DingSubmitStatusEnumConverter.class)
 
+    @ApiModelProperty(value = "状态，START：已开始，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
+    @ExcelProperty(value = "提交状态", converter = DingSubmitStatusEnumConverter.class)
     private DingSubmitStatusEnum status;
 
     public Long getId() {
@@ -143,20 +170,36 @@ public class TBDingSubmitQueryResult implements Serializable {
         this.city = city;
     }
 
-    public Long getExamStartTime() {
-        return examStartTime;
+    public Long getScanStartTime() {
+        return scanStartTime;
+    }
+
+    public void setScanStartTime(Long scanStartTime) {
+        this.scanStartTime = scanStartTime;
+    }
+
+    public Long getScanEndTime() {
+        return scanEndTime;
+    }
+
+    public void setScanEndTime(Long scanEndTime) {
+        this.scanEndTime = scanEndTime;
+    }
+
+    public Long getMarkPaperStartTime() {
+        return markPaperStartTime;
     }
 
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
+    public void setMarkPaperStartTime(Long markPaperStartTime) {
+        this.markPaperStartTime = markPaperStartTime;
     }
 
-    public Long getExamEndTime() {
-        return examEndTime;
+    public Long getMarkPaperEndTime() {
+        return markPaperEndTime;
     }
 
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
+    public void setMarkPaperEndTime(Long markPaperEndTime) {
+        this.markPaperEndTime = markPaperEndTime;
     }
 
     public String getUserName() {

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingSubmitServiceImpl.java

@@ -69,13 +69,9 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             }
             supplierId = userSupplierId;
         }
-        IPage<DingSubmitResult> page = this.baseMapper.findDingSubmitPage(new Page<>(pageNumber, pageSize),
+        return this.baseMapper.findDingSubmitPage(new Page<>(pageNumber, pageSize),
                 serviceUnitId, dingSubmitStatusEnumList, submitUserId, archivesName, supplierId, customName, sopNo,
                 violationHoursLimit, dingExceptionLimit, exceptionLimit, dpr);
-        for (DingSubmitResult record : page.getRecords()) {
-            record.setRemainCount(tbDingService.findRemainCount(record.getUserId(), record.getSopNo()));
-        }
-        return page;
     }
 
     @Override
@@ -187,11 +183,17 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             dto.setCustomName(e.getCustomName());
             dto.setProvince(e.getProvince());
             dto.setCity(e.getCity());
-            if (e.getApproachTime() != null && e.getApproachTime() > 0) {
-                dto.setApproachTime(DateDisposeUtils.getDateStr(e.getApproachTime()));
+            if (SystemConstant.longNotNull(e.getScanStartTime())) {
+                dto.setScanStartTime(DateDisposeUtils.getDateStr(e.getScanStartTime()));
+            }
+            if (SystemConstant.longNotNull(e.getScanEndTime())) {
+                dto.setScanEndTime(DateDisposeUtils.getDateStr(e.getScanEndTime()));
+            }
+            if (SystemConstant.longNotNull(e.getScanStartTime())) {
+                dto.setMarkPaperStartTime(DateDisposeUtils.getDateStr(e.getMarkPaperStartTime()));
             }
-            if (e.getDepartureTime() != null && e.getDepartureTime() > 0) {
-                dto.setDepartureTime(DateDisposeUtils.getDateStr(e.getDepartureTime()));
+            if (SystemConstant.longNotNull(e.getScanStartTime())) {
+                dto.setMarkPaperEndTime(DateDisposeUtils.getDateStr(e.getMarkPaperEndTime()));
             }
             dto.setArchivesInfo(e.getArchivesInfo());
             dto.setRoleType(e.getRoleType().getDesc());
@@ -234,8 +236,10 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
         tbDingSubmit.setSopNo(sopNo);
         tbDingSubmit.setCrmNo(dingSubmitResult.getCrmNo());
         tbDingSubmit.setUserArchivesId(userArchivesId);
-        tbDingSubmit.setApproachTime(dingSubmitResult.getApproachTime());
-        tbDingSubmit.setDepartureTime(dingSubmitResult.getDepartureTime());
+        tbDingSubmit.setScanStartTime(dingSubmitResult.getScanStartTime());
+        tbDingSubmit.setScanEndTime(dingSubmitResult.getScanEndTime());
+        tbDingSubmit.setMarkPaperStartTime(dingSubmitResult.getMarkPaperStartTime());
+        tbDingSubmit.setMarkPaperEndTime(dingSubmitResult.getMarkPaperEndTime());
         tbDingSubmit.setRoleType(dingSubmitResult.getRoleType());
         tbDingSubmit.setActualDays(dingSubmitResult.getActualDays());
         tbDingSubmit.setWeekdays(dingSubmitResult.getWeekdays());

sop-business/src/main/resources/mapper/TBDingMapper.xml

@@ -11,8 +11,10 @@
             c.NAME custom,
             ua.province,
             ua.city,
-            d.approach_time exam_start_time,
-            d.departure_time exam_end_time,
+            d.scan_start_time scanStartTime,
+            d.scan_end_time scanEndTime,
+            d.mark_paper_start_time markPaperStartTime,
+            d.mark_paper_end_time markPaperEndTime,
             ua.name user_name,
             ua.`code` user_no,
             r.`name` role_name,