Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepair.java

@@ -176,5 +176,5 @@ public class CapitalRepair extends BaseEntity {
     private Long regionId;
 
     @FieldName(name = "开工时间")
-    private LocalDateTime startWorkDateTime;
+    private LocalDateTime startWorkDatetime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -263,7 +263,7 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
     public boolean begin(CapitalRepairRequest request) {
         CapitalRepair capitalRepair = getOne(request.getProjectId());
         if (ObjectUtil.isEmpty(capitalRepair)) return false;
-        capitalRepair.setStartWorkDateTime(LocalDateTime.now());
+        capitalRepair.setStartWorkDatetime(LocalDateTime.now());
         capitalRepair.setProjectStatus(CapitalRepairStatus.ABUILDING.getCode());
         return updateById(capitalRepair);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -289,6 +289,8 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         }
         //新增标记 (0:新增,1:查询后带入)
         if ("0".equals(mark)) {
+            //前端新增时会传值过来，设置电梯id为null，防止新增电梯主键重复
+            lift.setId(null);
             //按当前日期时间戳自动生成电梯编号
             String liftCode = ApiConstants.STRAIGHT_LADDER + DateUtils.generateCode();
             if (CommonEnum.LiftType.STAIRCASE.getCode().equals(Objects.toString(lift.getLiftType()))) {

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

@@ -9,7 +9,9 @@ spring:
   datasource:
     hikari:
       max-lifetime: 1200000 # default: 1800000
-
+  servlet:
+    multipart:
+      max-file-size: 2MB
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/**Mapper.xml
   type-handlers-package: cn.com.ty.lift.business.framework.conf

lift-business-service/src/main/resources/mapper/capital/CapitalRepairMapper.xml

@@ -53,7 +53,7 @@
                c.overdue_date    AS overdueDate,
                c.overdue_reason  AS overdueReason,
                c.overdue_flag    AS overdueFlag,
-               c.start_work_datetime AS startWorkDateTime
+               c.start_work_datetime AS startWorkDatetime
         FROM capital_repair c
         LEFT JOIN region r ON c.region_id = r.id
         LEFT JOIN user_info ui ON r.user_id = ui.user_id