[chg] 补录维保单

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -22,6 +22,7 @@ import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
@@ -33,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -159,6 +162,16 @@ public class EmergencyRepairController {
     @PostMapping("page")
     @Judger(fields = "mtCompanyId")
     public RestResponse page(@RequestBody RepairRequest request){
+        LocalDate repairBegin = request.getRepairBegin();
+        LocalDate repairEnd = request.getRepairEnd();
+        if(!ObjectUtil.hasEmpty(repairBegin, repairEnd)){
+            long until = repairEnd.until(repairBegin, ChronoUnit.DAYS);
+            Judge.notTrue(until > StrPool.QUERY_MAX_DAYS, "最多只允许查询间隔" + StrPool.QUERY_MAX_DAYS + "天的记录");
+        }else if(null != repairBegin && null == repairEnd){
+            request.setRepairEnd(repairBegin.plusDays(StrPool.QUERY_MAX_DAYS));
+        }else {
+            request.setRepairBegin(repairEnd.plusDays(-StrPool.QUERY_MAX_DAYS));
+        }
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
         long count = emergencyRepairService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/dto/RepairRequest.java

@@ -1,11 +1,12 @@
 package cn.com.ty.lift.business.emergency.dto;
 
 import cn.com.ty.lift.business.emergency.entity.ErRecordCost;
-import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.ty.lift.common.judge.Judger;
+import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -58,13 +59,12 @@ public class RepairRequest extends PageRequest {
     /**
      * 报修开始时间
      */
-    private LocalDateTime repairBegin;
+    private LocalDate repairBegin;
 
     /**
      * 报修结束时间
      */
-    private LocalDateTime repairEnd;
-
+    private LocalDate repairEnd;
     /**
      * 急修单状态
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/EmergencyRepair.java

@@ -177,7 +177,7 @@ public class EmergencyRepair extends BaseEntity {
     private Integer status;
 
     /**
-     * 创建人ID 召修人就是发起人，是创建急修的人
+     * creator_id 召修人就是发起人，是创建急修的人
      */
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/impl/EmergencyRepairService.java

@@ -130,6 +130,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * @return EmergencyRepair
      */
     public EmergencyRepair findByMtCompanyAndLift(Long mtCompanyId, Long liftId) {
+        this.lambdaQuery();
         LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId, liftId);

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -221,7 +221,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("tofill")
     public RestResponse tofill(@Valid @RequestBody MaintenanceRecord entity){
-        entity.setStatus("0");
+        entity.setStatus("-2");
         entity.setIsRegular(0);
         //补录
         entity.setIsRepair(1);
@@ -308,6 +308,7 @@ public class MaintenanceRecordController {
         String maintenanceOption = request.getMaintenanceOption();
         List<String> imgs = request.getImgs();
         entity.setMaintenanceOption(maintenanceOption);
+        entity.setStatus("0");
         boolean result = maintenanceRecordService.fill(entity,imgs);
         return RestResponse.success(result);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -91,7 +91,7 @@ public class MaintenanceRecord extends BaseEntity {
 	 * 实际保养时间
 	 */
 	@Judger(message = "缺少实际保养时间")
-	private LocalDateTime workDate;
+	private LocalDate workDate;
 
 	/**
 	 * 停梯时间

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -124,7 +124,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             record.setCode(l.getLiftCode());
             record.setLiftType(l.getLiftType());
             record.setStatus(CommonEnum.MaintenanceRecordStatus.SIGN.getCode());
-            record.setWorkDate(LocalDateTime.now());
+            record.setWorkDate(LocalDate.now());
             record.setStopDate(LocalDateTime.now());
             MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
             if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.add.fail"));

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -140,10 +140,10 @@
                 AND er.worker_id1 = #{cond.workerId}
             </if>
             <if test="cond.repairBegin != null">
-                AND er.caller_date &gt; #{cond.repairBegin}
+                AND date(er.caller_date) &gt;= #{cond.repairBegin}
             </if>
             <if test="cond.repairEnd != null">
-                AND er.caller_date &lt; #{cond.repairEnd}
+                AND date(er.caller_date) &lt;= #{cond.repairEnd}
             </if>
             <if test="cond.status != null">
                 AND er.status = #{cond.status}

lift-common/src/main/java/cn.com.ty.lift.common/utils/StrPool.java

@@ -108,4 +108,7 @@ public interface StrPool {
     String[] EMPTY_ARRAY = new String[0];
 
     byte[] BYTES_NEW_LINE = StrPool.NEWLINE.getBytes();
+
+    // 查询记录的最大时间间隔
+    long QUERY_MAX_DAYS = 366;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.enterprise.oa.controller;
 import cn.com.ty.lift.common.model.CountPage;
 import cn.com.ty.lift.common.judge.Judge;
 import cn.com.ty.lift.common.judge.Judger;
+import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Attendance;
@@ -21,7 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 
 /**
  * <p>
@@ -38,8 +41,8 @@ import java.time.LocalTime;
 public class AttendanceController {
 
     private IAttendanceService         attendanceService;
-    private IMaintenanceCompanyService maintenanceCompanyService;
     private IAttendanceImgService      attendanceImgService;
+    private IMaintenanceCompanyService maintenanceCompanyService;
 
     /**
      * 根据id查找
@@ -64,6 +67,16 @@ public class AttendanceController {
     @PostMapping("list")
     @Judger(fields = "mtCompanyId")
     public RestResponse list(@RequestBody AttendanceRequest request) {
+        LocalDate begin = request.getBegin();
+        LocalDate end = request.getEnd();
+        if(!ObjectUtil.hasEmpty(begin, end)){
+            long until = end.until(begin, ChronoUnit.DAYS);
+            Judge.notTrue(until > StrPool.QUERY_MAX_DAYS, "最多只允许查询间隔" + StrPool.QUERY_MAX_DAYS + "天的记录");
+        }else if(null != begin && null == end){
+            request.setEnd(begin.plusDays(StrPool.QUERY_MAX_DAYS));
+        }else {
+            request.setBegin(end.plusDays(-StrPool.QUERY_MAX_DAYS));
+        }
         IPage<AttendanceResponse> pages = attendanceService.pageByCondition(request);
         long count = attendanceService.count();
         return RestResponse.success(CountPage.getCountPage(count, pages));

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/dto/AttendanceRequest.java

@@ -1,11 +1,11 @@
 package cn.com.ty.lift.enterprise.oa.dto;
 
-import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.ty.lift.common.judge.Judger;
+import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.LocalTime;
 
 /**
@@ -36,11 +36,11 @@ public class AttendanceRequest extends PageRequest {
     /**
      * 签到开始时间
      */
-    private LocalDateTime begin;
+    private LocalDate begin;
     /**
      * 签到结束时间
      */
-    private LocalDateTime end;
+    private LocalDate end;
 
     /**
      * 上午上班时间

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Attendance.java

@@ -61,8 +61,6 @@ public class Attendance extends BaseEntity {
     /**
      * 状态（是否迟到早退，0：否，1：是）
      */
-    @NotNull(message = "打卡状态不能为空")
-    @Range(max = 1,message = "请指定打卡状态")
     private Integer status;
 
     /**

lift-enterprise-service/src/main/resources/mapper/oa/AttendanceMapper.xml

@@ -32,10 +32,10 @@
 				AND att.mt_company_id = #{cond.mtCompanyId}
 			</if>
 			<if test="cond.begin != null">
-				AND att.create_date &gt; #{cond.begin}
+				AND date(att.create_date) &gt;= #{cond.begin}
 			</if>
 			<if test="cond.end != null">
-				AND att.create_date &lt; #{cond.end}
+				AND date(att.create_date) &lt;= #{cond.end}
 			</if>
 		</where>
 	</select>