Merge branch 'feature-bieao' of lift-manager/lift-server into develop

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

@@ -38,10 +38,4 @@ public abstract class BaseEntity implements Serializable {
      */
     @TableField(value = "update_id", fill = FieldFill.INSERT_UPDATE)
     private Long updateId;
-
-    /**
-     * 逻辑删除标识
-     */
-    @TableField(value = "delete_flag", fill = FieldFill.UPDATE)
-    private boolean deleteFlag;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/MetaHandler.java

@@ -25,8 +25,6 @@ public class MetaHandler implements MetaObjectHandler {
     private static final String CREATE_DATE = "createDate";
     private static final String UPDATE_ID = "updateId";
     private static final String UPDATE_DATE = "updateDate";
-    private static final String DELETE_FLAG = "deleteFlag";
-    private static final boolean DELETED_VALUE = true;
 
     @Override
     public void insertFill(MetaObject metaObject) {
@@ -55,12 +53,9 @@ public class MetaHandler implements MetaObjectHandler {
         if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_ID, metaObject))) {
             this.setFieldValByName(UPDATE_ID, userId, metaObject);
         }
-        if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_ID, metaObject))) {
+        if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_DATE, metaObject))) {
             LocalDateTime now = LocalDateTime.now();
-            this.setFieldValByName(UPDATE_ID, now, metaObject);
-        }
-        if (ObjectUtil.isEmpty(this.getFieldValByName(DELETE_FLAG, metaObject))) {
-            this.setFieldValByName(DELETE_FLAG, DELETED_VALUE, metaObject);
+            this.setFieldValByName(UPDATE_DATE, now, metaObject);
         }
     }
 

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

@@ -10,7 +10,6 @@ import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
 
@@ -87,12 +86,7 @@ public class LiftController {
      */
     @PostMapping("preJudgment")
     public RestResponse preJudgment(@RequestBody LiftExtensionRequest request) {
-        Lift lift = request.getLift();
-        String liftId = StrUtil.EMPTY;
-        if (ObjectUtil.isNotEmpty(lift)) {
-            liftId = lift.getId().toString();
-        }
-        return liftService.preJudgment(request.getMtCompanyId(), request.getCode(), liftId);
+        return liftService.preJudgment(request.getMtCompanyId(), request.getCode(), request.getId());
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftExtensionRequest.java

@@ -41,6 +41,11 @@ public class LiftExtensionRequest {
      */
     private String code;
 
+    /**
+     * 电梯id
+     */
+    private String id;
+
     /**
      * 电梯
      */

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.maintenance.dao.entity.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -21,14 +22,20 @@ public class UpdateMaintenancePlanReq {
      * 维保公司ID
      */
     private Long mtCompanyId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
 
     /**
      * 当前时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date currentTime;
 
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -3,11 +3,11 @@ package cn.com.ty.lift.business.maintenance.dao.mapper;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
 
-    List<MaintenancePlan> findIdList(Date currentTime);
+    List<MaintenancePlan> findIdList(@Param("request") UpdateMaintenancePlanReq request);
 
     IPage<MaintenancePlanResponse> findByCondition(IPage page, @Param("request") MaintenancePlanRequest request);
 }

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

@@ -169,7 +169,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         Long interval = DateUtil.betweenDay(currentTime, updateTime, false);
         int offset = interval.intValue();
         //获取当前时间后的维保计划id列表
-        List<MaintenancePlan> idList = planMapper.findIdList(currentTime);
+        List<MaintenancePlan> idList = planMapper.findIdList(request);
         for (MaintenancePlan entry : idList) {
             Date planDate;
             if (result > 0) {

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -125,7 +125,7 @@
 	<select id="findLiftExist" parameterType="java.lang.String" resultType="java.lang.Long">
 		SELECT id FROM lift
 		WHERE 1=1
-		<if test="liftId == null and liftId = ''">
+		<if test="liftId == null or liftId = ''">
 			AND registration_code = #{registrationCode,jdbcType=VARCHAR}
 		</if>
 		<if test="liftId!=null and liftId!=''">

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -71,12 +71,22 @@
 		</if>
 	</select>
 
-	<select id="findIdList" resultMap="BaseResultMap" parameterType="java.util.Date">
+	<select id="findIdList" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq">
 		SELECT
 		id,
-		plan_date AS planDate
+        lift_id,
+		plan_date
 		FROM maintenance_plan
-		WHERE plan_date > #{currentTime,jdbcType=TIMESTAMP}
+		WHERE 1=1
+        <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
+            AND mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+        </if>
+        <if test="request.projectId!=null and request.projectId!=''">
+            AND project_id = #{request.projectId,jdbcType=BIGINT}
+        </if>
+        <if test="request.liftId!=null and request.liftId!=''">
+            AND lift_id = #{request.liftId,jdbcType=BIGINT}
+        </if>
 	</select>
 
 </mapper>