Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -23,7 +23,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 
 /**
  * <p>
@@ -210,19 +209,12 @@ public class AnnualInspectionController {
             return RestResponse.fail("请设置下次年检时间");
         }
 
-        if(stepStatus == Values.AI_STATUS_NOT_START){
-            entity.setStepName(Values.AI_STEP_NOT_START);
-        }else if(stepStatus >= Values.AI_STATUS_COMFIRM && stepStatus <= Values.AI_STATUS_SELFCHECK){
-            entity.setStepName(Values.AI_STEP_ONE);
-        }else if(stepStatus == Values.AI_STATUS_CHECK_COMFIRM){
-            entity.setStepName(Values.AI_STEP_TWO);
-        }else if(stepStatus >= Values.AI_STATUS_CHECK_UPLOAD && stepStatus <= Values.AI_STATUS_CHECK_UNQUALIFIED){
-            entity.setStepName(Values.AI_STEP_THREE);
-        }else if(stepStatus >= Values.AI_STATUS_CERTIFICATE_REPORT_UPLOAD && stepStatus <= Values.AI_STATUS_CERTIFICATE_REPORT_UNQUALIFIED){
-            entity.setStepName(Values.AI_STEP_FOUR);
-        }else{
+        int stepName = Values.toStepName(stepStatus);
+        if(stepName == -1){
             return RestResponse.fail("年检状态有误,状态码: " + stepStatus);
         }
+        entity.setStepName(stepName);
+
         if(stepStatus == Values.AI_STATUS_CERTIFICATE_REPORT_QUALIFIED || stepStatus == Values.AI_STATUS_CERTIFICATE_REPORT_UNQUALIFIED){
             // 设置年检完成 status = 1
             entity.setFinishTime(LocalDateTime.now());

lift-business-service/src/main/java/cn/com/ty/lift/business/common/Values.java

@@ -103,19 +103,39 @@ public interface Values {
      */
     int ER_STATUS_CLOSE = 6;
 
-    String LF_CATEGORY_LOCATION_PHENOMENON = "故障部位和现象";
-    String LF_CATEGORY_REASON = "故障原因";
-    String LF_CATEGORY_HANDLE = "故障处理";
-    String LF_CATEGORY_NATURE = "故障性质";
-    String LF_CATEGORY_LIABILITY = "故障责任";
-
-    String LF_TYPE_DOOR = "门系统";
-    String LF_TYPE_TRACTION = "曳引系统";
-    String LF_TYPE_CONTROL = "控制系统";
-    String LF_TYPE_SAFETY_PROTECTION = "安全保护装置";
-    String LF_TYPE_OTHER = "其他";
-    String LF_TYPE_DRIVER_HOST = "驱动主机";
-    String LF_TYPE_ELECTRICAL_REASON = "电气原因";
-    String LF_TYPE_MECHANICAL_REASON = "机械原因";
-    String LF_TYPE_OTHER_REASON = "其他原因";
+    /**
+     * 根据年检的状态值返回成年检的状态阶段
+     * @param stepStatus
+     * @return
+     */
+    static int toStepName(Integer stepStatus){
+        int stepName;
+        switch (stepStatus){
+            case AI_STATUS_NOT_START:
+                stepName = 0;
+                break;
+            case AI_STATUS_COMFIRM:
+            case AI_STATUS_SELFCHECK:
+                stepName = 1;
+                break;
+            case AI_STATUS_CHECK_COMFIRM:
+                stepName = 2;
+                break;
+            case AI_STATUS_CHECK_UPLOAD:
+            case AI_STATUS_CHECK_QUALIFIED:
+            case AI_STATUS_CHECK_RECTIFICATION:
+            case AI_STATUS_CHECK_UNQUALIFIED:
+                stepName = 3;
+                break;
+            case AI_STATUS_CERTIFICATE_REPORT_UPLOAD:
+            case AI_STATUS_CERTIFICATE_REPORT_QUALIFIED:
+            case AI_STATUS_CERTIFICATE_REPORT_UNQUALIFIED:
+                stepName = 4;
+                break;
+            default:
+                stepName = -1;
+                break;
+        }
+        return stepName;
+    }
 }

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

@@ -11,7 +11,8 @@ import lombok.Data;
  * @since 2019-12-12 11:27:30
  */
 @Data
-public class MaintenanceCompany {
+public class
+MaintenanceCompany {
 	private Long id;
 
 	private String name;

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

@@ -7,6 +7,7 @@ import cn.com.ty.lift.enterprise.oa.entity.Announcement;
 import cn.com.ty.lift.enterprise.oa.service.AnnouncementService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,9 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
+@AllArgsConstructor
 @RequestMapping("/oa/announcement")
 public class AnnouncementController {
-    @Autowired
+
     private AnnouncementService announcementService;
 
     /**

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

@@ -154,6 +154,7 @@ public class AttendanceController {
         }
         Attendance attendance = new Attendance();
         attendance.setMtCompanyId(mtCompanyId);
+        //fixme:获取当前用户?
         attendance.setUserId(1l);
         attendance.setCoordinate(coordinate);
         attendance.setAddress(address);

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

@@ -129,7 +129,7 @@ public class LiftCertificateController {
         if (null == entity) {
             return RestResponse.failParam();
         }
-        if(StrUtil.isEmpty(entity.getFirstImgUrl()) || StrUtil.isEmpty(entity.getSecondImgUrl())){
+        if(StrUtil.hasEmpty(entity.getFirstImgUrl(),entity.getSecondImgUrl())){
             return RestResponse.fail("请上传操作证图片");
         }
         boolean result = liftCertificateService.save(entity);

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.enterprise.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
@@ -46,7 +48,7 @@ public class LiftCertificate implements Serializable {
      * 有效期
      */
     @TableField("expiration_date")
-    private LocalDateTime expirationDate;
+    private LocalDate expirationDate;
 
     /**
      * 证件类型

lift-enterprise-service/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   profiles:
     active: dev
   datasource:
-    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: ms.c88pocY/