维修记录

src/main/java/com/fdkankan/sale/common/RequestBase.java

@@ -32,13 +32,13 @@ public class RequestBase implements Serializable {
         if(StringUtils.isBlank(startTime) && timeList != null && timeList.size() >0){
             return DateUtil.getStartTime(timeList.get(0));
         }
-        return startTime;
+        return startTime +" 00:00:00";
     }
 
     public String getEndTime() {
-        if(StringUtils.isBlank(startTime) && timeList != null && timeList.size() >1){
+        if(StringUtils.isBlank(endTime) && timeList != null && timeList.size() >1){
             return DateUtil.getEndTime(timeList.get(1));
         }
-        return endTime;
+        return endTime +" 23:59:59";
     }
 }

src/main/java/com/fdkankan/sale/common/ResultCode.java

@@ -14,6 +14,8 @@ public enum ResultCode  {
     USER_NOT_LOGIN(4008, "用户未登录"),
     DATA_TOO_LONG(4009, "长度超出限制！"),
     USER_ERROR(4010, "该账号未使用"),
+    DATA_TOO_BIG(4011, "大小超过限制！"),
+
 
     DEL_ROLE_ERROR(50035, "该角色已关联用户，不可删除。请先修改相关用户的角色！"),
     MAIL_SEND_ERROR(50033, "邮件发送失败！"),

src/main/java/com/fdkankan/sale/exception/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.fdkankan.sale.exception;
 
+import com.fasterxml.jackson.core.exc.InputCoercionException;
 import com.fdkankan.sale.common.ResultCode;
 import com.fdkankan.sale.common.ResultData;
 import lombok.extern.slf4j.Slf4j;
@@ -49,4 +50,16 @@ public class GlobalExceptionHandler {
         }
         return ResultData.error( 500, e.getCause().getMessage());
     }
+    /**
+     * 处理业务异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = InputCoercionException.class)
+    public ResultData InputCoercionExceptionHandler(InputCoercionException e) {
+        log.error("数字大小:", e);
+        if(e.getCause().getMessage().contains("out of range of")){
+            return ResultData.error(ResultCode.DATA_TOO_LONG);
+        }
+        return ResultData.error( 500, e.getCause().getMessage());
+    }
 }

src/main/java/com/fdkankan/sale/service/IRepairRegisterService.java

@@ -25,5 +25,5 @@ public interface IRepairRegisterService extends IService<RepairRegister> {
 
     RepairRegisterVo getVoByRegisterId(Integer registerId);
 
-    void testPass(String repairId);
+    void testPassOrFail(String repairId,Integer status);
 }

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -170,6 +170,7 @@ public class RepairPersonnelService {
         BeanUtils.copyProperties(param,repairRegister);
         repairRegister.setSysUserId(userId);
         repairRegister.setDefineDamage(0);
+        repairRegister.setStatus(1);
         repairRegisterService.save(repairRegister);
 
         this.addRepairPart(param.getPartList(),repair,repairRegister);

src/main/java/com/fdkankan/sale/service/impl/RepairRegisterServiceImpl.java

@@ -43,7 +43,7 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
     public void repairOver(String repairId, String remark,Long userId) {
         RepairRegister repairRegister = new RepairRegister();
         repairRegister.setRepairId(repairId);
-        repairRegister.setStatus(1);
+        repairRegister.setStatus(2);
         repairRegister.setRemark(remark);
         repairRegister.setOverTime(DateUtil.getDate());
         repairRegister.setSysUserId(userId);
@@ -52,11 +52,11 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
     }
 
     @Override
-    public void testPass(String repairId) {
+    public void testPassOrFail(String repairId,Integer status) {
         LambdaUpdateWrapper<RepairRegister> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(RepairRegister::getRepairId,repairId);
-        wrapper.eq(RepairRegister::getStatus,1);
-        wrapper.set(RepairRegister::getStatus,2);
+        wrapper.eq(RepairRegister::getStatus,2);
+        wrapper.set(RepairRegister::getStatus,status);
         wrapper.set(RepairRegister::getOverTime, DateUtil.getDate());
         this.update(wrapper);
     }

src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -76,13 +76,14 @@ public class RepairTesterService {
         if(testParam.getResultStatus() == 0){
             entity.setPassTime(DateUtil.getDate());
             repairTestService.save(entity);
-            repairRegisterService.testPass(repair.getRepairId());
+            repairRegisterService.testPassOrFail(repair.getRepairId(),3);
             if(repair.getWarrantyType() == 0 ){
                 repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"测试通过",entity.getTestId());
             }else {
                 repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(),"测试通过",entity.getTestId());
             }
         }else {
+            repairRegisterService.testPassOrFail(repair.getRepairId(),4);
             repairTestService.save(entity);
             repairLogService.saveBySysUser(userId,testParam.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),"测试不通过",entity.getTestId());
         }

src/main/resources/mapper/sale/RepairMapper.xml

@@ -11,7 +11,7 @@
             left join  t_repair_register rr on r.repair_id = rr.repair_id
             left join  t_customer c on r.repair_id = c.repair_id
             left join  t_customer_address cd on r.repair_id = cd.repair_id
-        where r.rec_status = 'A' and r.status in
+        where r.rec_status = 'A' and rr.status = 0 and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
         </foreach>
@@ -46,7 +46,7 @@
             left join  t_order_receiving o on r.repair_id = o.repair_id
             left join  t_repair_register rr on r.repair_id = rr.repair_id
             left join  t_customer c on r.repair_id = c.repair_id
-        where r.rec_status = 'A' and r.status in
+        where r.rec_status = 'A'and rr.status = 0 and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
         </foreach>
@@ -73,7 +73,7 @@
         left join  t_order_receiving o on r.repair_id = o.repair_id
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
-        where r.rec_status = 'A' and r.status in
+        where r.rec_status = 'A' and rr.status = 0 and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
         </foreach>
@@ -96,7 +96,7 @@
         left join  t_order_receiving o on r.repair_id = o.repair_id
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
-        where r.rec_status = 'A' and r.status in
+        where r.rec_status = 'A' and rr.status = 0 and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
         </foreach>
@@ -124,7 +124,7 @@
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
         left join t_repair_pay rp on r.repair_id = rp.repair_id
-        where r.rec_status = 'A'
+        where r.rec_status = 'A' and rr.status = 0
         <if test="param.repairId != null and param.repairId != ''">
             and r.repair_id like  concat ('%',#{param.repairId},'%')
         </if>