Merge branch 'master' of http://159.138.158.56:10300/lihao16/elevator-96133

* 'master' of http://159.138.158.56:10300/lihao16/elevator-96133:
  feat:新增按日期范围查询/用电梯名或安全码查询工单

inspur-work/src/main/java/com/inspur/domain/ElevatorWorkOrder.java

@@ -2,351 +2,168 @@ package com.inspur.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.ToString;
 import com.inspur.common.annotation.Excel;
 import com.inspur.common.core.domain.BaseEntity;
 
 /**
- * 电梯工单信息对象 elevator_work_order
+ * 工单系统对象 elevator_work_order
  * 
  * @author inspur
- * @date 2024-09-18
+ * @date 2024-09-20
  */
-public class ElevatorWorkOrder extends BaseEntity
-{
+@Data
+@ToString
+public class ElevatorWorkOrder extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 被困人员电话 */
+    /**
+     * 被困人员电话
+     */
     @Excel(name = "被困人员电话")
-
     private String trappedPersonTel;
 
-    /** 所在地区 */
+    /**
+     * 所在地区
+     */
     @Excel(name = "所在地区")
     private String region;
 
-    /** 所在小区 */
+    /**
+     * 所在小区
+     */
     @Excel(name = "所在小区")
     private String community;
 
-    /** 所在楼栋 */
+    /**
+     * 所在楼栋
+     */
     @Excel(name = "所在楼栋")
     private String building;
 
-    /** 电梯名称 */
+    /**
+     * 电梯名称
+     */
     @Excel(name = "电梯名称")
     private String elevatorName;
 
-    /** 电梯安全码 */
+    /**
+     * 电梯安全码
+     */
     @Excel(name = "电梯安全码")
     private String securityCode;
 
-    /** 状态 0:未接单1:已接单 */
-    @Excel(name = "状态 0:未接单1:已接单")
+    /**
+     * 接单状态
+     */
+    @Excel(name = "接单状态")
     private Integer status;
 
-    /** 创建日期 */
+    /**
+     * 创建日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createDate;
 
-    /** 录音时长 */
+    /**
+     * 创建日期开始
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDateStart;
+    /**
+     * 创建日期结束
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDateEnd;
+    /**
+     * 录音时长
+     */
     @Excel(name = "录音时长")
     private Long recordingDuration;
 
-    /** 通话录音地址 */
+    /**
+     * 通话录音地址
+     */
     @Excel(name = "通话录音地址")
     private String callRecording;
 
-    /** 维保公司 */
+    /**
+     * 维保公司
+     */
     @Excel(name = "维保公司")
     private String maintCompany;
 
-    /** 维保人员1 */
+    /**
+     * 维保人员1
+     */
     @Excel(name = "维保人员1")
     private String maintFristPerson;
 
-    /** 维保人员1电话 */
+    /**
+     * 维保人员1电话
+     */
     @Excel(name = "维保人员1电话")
     private String maintfristTel;
 
-    /** 维保人员2 */
+    /**
+     * 维保人员2
+     */
     @Excel(name = "维保人员2")
     private String maintSecondPerson;
 
-    /** 维保人员2电话 */
+    /**
+     * 维保人员2电话
+     */
     @Excel(name = "维保人员2电话")
     private String maintSecondTel;
 
-    /** 物业人员 */
+    /**
+     * 物业人员
+     */
     @Excel(name = "物业人员")
     private String tenementPerson;
 
-    /** 物业电话 */
+    /**
+     * 物业电话
+     */
     @Excel(name = "物业电话")
     private String tenementTel;
 
-    /** 处理人 */
+    /**
+     * 处理人
+     */
     @Excel(name = "处理人")
     private String handler;
 
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     @Excel(name = "联系电话")
     private String handleContactTel;
 
-    /** 处理部门 */
+    /**
+     * 处理部门
+     */
     @Excel(name = "处理部门")
     private String handleDepart;
 
-    /** 处理时间 */
+    /**
+     * 处理时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date handleTime;
 
-    /** 删除标志（0代表存在 1代表删除） */
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTrappedPersonTel(String trappedPersonTel) 
-    {
-        this.trappedPersonTel = trappedPersonTel;
-    }
-
-    public String getTrappedPersonTel() 
-    {
-        return trappedPersonTel;
-    }
-    public void setRegion(String region) 
-    {
-        this.region = region;
-    }
-
-    public String getRegion() 
-    {
-        return region;
-    }
-    public void setCommunity(String community) 
-    {
-        this.community = community;
-    }
-
-    public String getCommunity() 
-    {
-        return community;
-    }
-    public void setBuilding(String building) 
-    {
-        this.building = building;
-    }
-
-    public String getBuilding() 
-    {
-        return building;
-    }
-    public void setElevatorName(String elevatorName) 
-    {
-        this.elevatorName = elevatorName;
-    }
-
-    public String getElevatorName() 
-    {
-        return elevatorName;
-    }
-    public void setSecurityCode(String securityCode) 
-    {
-        this.securityCode = securityCode;
-    }
-
-    public String getSecurityCode() 
-    {
-        return securityCode;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setCreateDate(Date createDate) 
-    {
-        this.createDate = createDate;
-    }
-
-    public Date getCreateDate() 
-    {
-        return createDate;
-    }
-    public void setRecordingDuration(Long recordingDuration) 
-    {
-        this.recordingDuration = recordingDuration;
-    }
-
-    public Long getRecordingDuration() 
-    {
-        return recordingDuration;
-    }
-    public void setCallRecording(String callRecording) 
-    {
-        this.callRecording = callRecording;
-    }
-
-    public String getCallRecording() 
-    {
-        return callRecording;
-    }
-    public void setMaintCompany(String maintCompany) 
-    {
-        this.maintCompany = maintCompany;
-    }
-
-    public String getMaintCompany() 
-    {
-        return maintCompany;
-    }
-    public void setMaintFristPerson(String maintFristPerson) 
-    {
-        this.maintFristPerson = maintFristPerson;
-    }
-
-    public String getMaintFristPerson() 
-    {
-        return maintFristPerson;
-    }
-    public void setMaintfristTel(String maintfristTel) 
-    {
-        this.maintfristTel = maintfristTel;
-    }
-
-    public String getMaintfristTel() 
-    {
-        return maintfristTel;
-    }
-    public void setMaintSecondPerson(String maintSecondPerson) 
-    {
-        this.maintSecondPerson = maintSecondPerson;
-    }
-
-    public String getMaintSecondPerson() 
-    {
-        return maintSecondPerson;
-    }
-    public void setMaintSecondTel(String maintSecondTel) 
-    {
-        this.maintSecondTel = maintSecondTel;
-    }
-
-    public String getMaintSecondTel() 
-    {
-        return maintSecondTel;
-    }
-    public void setTenementPerson(String tenementPerson) 
-    {
-        this.tenementPerson = tenementPerson;
-    }
-
-    public String getTenementPerson() 
-    {
-        return tenementPerson;
-    }
-    public void setTenementTel(String tenementTel) 
-    {
-        this.tenementTel = tenementTel;
-    }
-
-    public String getTenementTel() 
-    {
-        return tenementTel;
-    }
-    public void setHandler(String handler) 
-    {
-        this.handler = handler;
-    }
-
-    public String getHandler() 
-    {
-        return handler;
-    }
-    public void setHandleContactTel(String handleContactTel) 
-    {
-        this.handleContactTel = handleContactTel;
-    }
-
-    public String getHandleContactTel() 
-    {
-        return handleContactTel;
-    }
-    public void setHandleDepart(String handleDepart) 
-    {
-        this.handleDepart = handleDepart;
-    }
-
-    public String getHandleDepart() 
-    {
-        return handleDepart;
-    }
-    public void setHandleTime(Date handleTime) 
-    {
-        this.handleTime = handleTime;
-    }
-
-    public Date getHandleTime() 
-    {
-        return handleTime;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("trappedPersonTel", getTrappedPersonTel())
-            .append("region", getRegion())
-            .append("community", getCommunity())
-            .append("building", getBuilding())
-            .append("elevatorName", getElevatorName())
-            .append("securityCode", getSecurityCode())
-            .append("status", getStatus())
-            .append("createDate", getCreateDate())
-            .append("recordingDuration", getRecordingDuration())
-            .append("callRecording", getCallRecording())
-            .append("maintCompany", getMaintCompany())
-            .append("maintFristPerson", getMaintFristPerson())
-            .append("maintfristTel", getMaintfristTel())
-            .append("maintSecondPerson", getMaintSecondPerson())
-            .append("maintSecondTel", getMaintSecondTel())
-            .append("tenementPerson", getTenementPerson())
-            .append("tenementTel", getTenementTel())
-            .append("handler", getHandler())
-            .append("handleContactTel", getHandleContactTel())
-            .append("handleDepart", getHandleDepart())
-            .append("handleTime", getHandleTime())
-            .append("delFlag", getDelFlag())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

inspur-work/src/main/java/com/inspur/mapper/ElevatorWorkOrderMapper.java

@@ -1,59 +1,58 @@
 package com.inspur.mapper;
 
 import java.util.List;
-
 import com.inspur.domain.ElevatorWorkOrder;
 
 /**
- * 电梯工单信息Mapper接口
+ * 工单系统Mapper接口
  * 
  * @author inspur
- * @date 2024-09-18
+ * @date 2024-09-20
  */
 public interface ElevatorWorkOrderMapper 
 {
     /**
-     * 查询电梯工单信息
+     * 查询工单系统
      * 
-     * @param id 电梯工单信息主键
-     * @return 电梯工单信息
+     * @param id 工单系统主键
+     * @return 工单系统
      */
     public ElevatorWorkOrder selectElevatorWorkOrderById(Long id);
 
     /**
-     * 查询电梯工单信息列表
+     * 查询工单系统列表
      * 
-     * @param elevatorWorkOrder 电梯工单信息
-     * @return 电梯工单信息集合
+     * @param elevatorWorkOrder 工单系统
+     * @return 工单系统集合
      */
     public List<ElevatorWorkOrder> selectElevatorWorkOrderList(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 新增电梯工单信息
+     * 新增工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     public int insertElevatorWorkOrder(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 修改电梯工单信息
+     * 修改工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     public int updateElevatorWorkOrder(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 删除电梯工单信息
+     * 删除工单系统
      * 
-     * @param id 电梯工单信息主键
+     * @param id 工单系统主键
      * @return 结果
      */
     public int deleteElevatorWorkOrderById(Long id);
 
     /**
-     * 批量删除电梯工单信息
+     * 批量删除工单系统
      * 
      * @param ids 需要删除的数据主键集合
      * @return 结果

inspur-work/src/main/java/com/inspur/service/IElevatorWorkOrderService.java

@@ -1,61 +1,60 @@
 package com.inspur.service;
 
 import java.util.List;
-
 import com.inspur.domain.ElevatorWorkOrder;
 
 /**
- * 电梯工单信息Service接口
+ * 工单系统Service接口
  * 
  * @author inspur
- * @date 2024-09-18
+ * @date 2024-09-20
  */
 public interface IElevatorWorkOrderService 
 {
     /**
-     * 查询电梯工单信息
+     * 查询工单系统
      * 
-     * @param id 电梯工单信息主键
-     * @return 电梯工单信息
+     * @param id 工单系统主键
+     * @return 工单系统
      */
     public ElevatorWorkOrder selectElevatorWorkOrderById(Long id);
 
     /**
-     * 查询电梯工单信息列表
+     * 查询工单系统列表
      * 
-     * @param elevatorWorkOrder 电梯工单信息
-     * @return 电梯工单信息集合
+     * @param elevatorWorkOrder 工单系统
+     * @return 工单系统集合
      */
     public List<ElevatorWorkOrder> selectElevatorWorkOrderList(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 新增电梯工单信息
+     * 新增工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     public int insertElevatorWorkOrder(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 修改电梯工单信息
+     * 修改工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     public int updateElevatorWorkOrder(ElevatorWorkOrder elevatorWorkOrder);
 
     /**
-     * 批量删除电梯工单信息
+     * 批量删除工单系统
      * 
-     * @param ids 需要删除的电梯工单信息主键集合
+     * @param ids 需要删除的工单系统主键集合
      * @return 结果
      */
     public int deleteElevatorWorkOrderByIds(Long[] ids);
 
     /**
-     * 删除电梯工单信息信息
+     * 删除工单系统信息
      * 
-     * @param id 电梯工单信息主键
+     * @param id 工单系统主键
      * @return 结果
      */
     public int deleteElevatorWorkOrderById(Long id);

inspur-work/src/main/java/com/inspur/service/impl/ElevatorWorkOrderServiceImpl.java

@@ -2,29 +2,29 @@ package com.inspur.service.impl;
 
 import java.util.List;
 import com.inspur.common.utils.DateUtils;
-import com.inspur.domain.ElevatorWorkOrder;
-import com.inspur.mapper.ElevatorWorkOrderMapper;
-import com.inspur.service.IElevatorWorkOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.inspur.mapper.ElevatorWorkOrderMapper;
+import com.inspur.domain.ElevatorWorkOrder;
+import com.inspur.service.IElevatorWorkOrderService;
 
 /**
- * 电梯工单信息Service业务层处理
+ * 工单系统Service业务层处理
  * 
  * @author inspur
- * @date 2024-09-18
+ * @date 2024-09-20
  */
 @Service
-public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
+public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService 
 {
     @Autowired
     private ElevatorWorkOrderMapper elevatorWorkOrderMapper;
 
     /**
-     * 查询电梯工单信息
+     * 查询工单系统
      * 
-     * @param id 电梯工单信息主键
-     * @return 电梯工单信息
+     * @param id 工单系统主键
+     * @return 工单系统
      */
     @Override
     public ElevatorWorkOrder selectElevatorWorkOrderById(Long id)
@@ -33,10 +33,10 @@ public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
     }
 
     /**
-     * 查询电梯工单信息列表
+     * 查询工单系统列表
      * 
-     * @param elevatorWorkOrder 电梯工单信息
-     * @return 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
+     * @return 工单系统
      */
     @Override
     public List<ElevatorWorkOrder> selectElevatorWorkOrderList(ElevatorWorkOrder elevatorWorkOrder)
@@ -45,9 +45,9 @@ public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
     }
 
     /**
-     * 新增电梯工单信息
+     * 新增工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     @Override
@@ -58,9 +58,9 @@ public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
     }
 
     /**
-     * 修改电梯工单信息
+     * 修改工单系统
      * 
-     * @param elevatorWorkOrder 电梯工单信息
+     * @param elevatorWorkOrder 工单系统
      * @return 结果
      */
     @Override
@@ -71,9 +71,9 @@ public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
     }
 
     /**
-     * 批量删除电梯工单信息
+     * 批量删除工单系统
      * 
-     * @param ids 需要删除的电梯工单信息主键
+     * @param ids 需要删除的工单系统主键
      * @return 结果
      */
     @Override
@@ -83,9 +83,9 @@ public class ElevatorWorkOrderServiceImpl implements IElevatorWorkOrderService
     }
 
     /**
-     * 删除电梯工单信息信息
+     * 删除工单系统信息
      * 
-     * @param id 电梯工单信息主键
+     * @param id 工单系统主键
      * @return 结果
      */
     @Override

inspur-work/src/main/resources/mapper/work/ElevatorWorkOrderMapper.xml

@@ -40,10 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectElevatorWorkOrderList" parameterType="ElevatorWorkOrder" resultMap="ElevatorWorkOrderResult">
         <include refid="selectElevatorWorkOrderVo"/>
         <where>  
-            <if test="elevatorName != null  and elevatorName != ''"> and elevator_name like concat('%', #{elevatorName}, '%')</if>
+            <if test="elevatorName != null  and elevatorName != ''"> and (elevator_name like concat('%', #{elevatorName}, '%') or security_code like concat('%', #{elevatorName}, '%'))</if>
             <if test="securityCode != null  and securityCode != ''"> and security_code like concat('%', #{securityCode}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="createDate != null "> and create_date = #{createDate}</if>
+            <!--<if test="createDate != null "> and create_date = #{createDate}</if>-->
+            <if test="createDateStart != null"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{createDateStart},'%Y%m%d')
+            </if>
+            <if test="createDateEnd != null"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{createDateEnd},'%Y%m%d')
+            </if>
         </where>
     </select>