优化代码

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -126,6 +126,9 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairSettingType;
     private String repairSettingTypeName;
 
+    private String startTime;
+    private String endTime;
+
 
     public String getRepairName() {
         return repairName;
@@ -551,4 +554,20 @@ public class RepairDto extends PageDto implements Serializable {
     public void setRepairNameLike(String repairNameLike) {
         this.repairNameLike = repairNameLike;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -212,6 +212,12 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{startTime}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -221,6 +227,10 @@
         <if test="repairObjId !=null and repairObjId != ''">
             and t.repair_obj_id= #{repairObjId}
         </if>
+        <if test="repairObjName !=null and repairObjName != ''">
+            and t.repair_obj_name like concat('%',#{repairObjName},'%')
+        </if>
+
         <if test="repairChannel !=null and repairChannel != ''">
             and t.repair_channel= #{repairChannel}
         </if>
@@ -365,6 +375,12 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{startTime}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -377,6 +393,9 @@
         <if test="repairObjId !=null and repairObjId != ''">
             and t.repair_obj_id= #{repairObjId}
         </if>
+        <if test="repairObjName !=null and repairObjName != ''">
+            and t.repair_obj_name like concat('%',#{repairObjName},'%')
+        </if>
         <if test="maintenanceType !=null and maintenanceType != ''">
             and t.maintenance_type= #{maintenanceType}
         </if>

service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java

@@ -55,17 +55,19 @@ public class ListOwnerRepairsCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         hasOwnerId(reqJson);
         RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
+        //todo 处理时间
+        ifHasTime(ownerRepairDto);
         if (!StringUtil.isEmpty(ownerRepairDto.getRoomId()) && ownerRepairDto.getRoomId().contains(",")) {
             String[] roomIds = ownerRepairDto.getRoomId().split(",");
             ownerRepairDto.setRoomIds(roomIds);
             ownerRepairDto.setRoomId("");
         }
-        //PC电话报修、PC工单池、H5工单池
-        //手机端员工单工单池 只返回未处理状态的数据
+        //todo PC电话报修、PC工单池、H5工单池
+        //todo 手机端员工单工单池 只返回未处理状态的数据
         if (!StringUtil.isEmpty(ownerRepairDto.getReqSource()) && ownerRepairDto.getReqSource().equals("mobile")) {
             ownerRepairDto.setState(RepairDto.STATE_WAIT);
         }
-        //pc电话报修模块 只返回PC员工登记和手机端员工登记的数据
+        //todo pc电话报修模块 只返回PC员工登记和手机端员工登记的数据
         if (!StringUtil.isEmpty(ownerRepairDto.getReqSource()) && ownerRepairDto.getReqSource().equals("pc_mobile")) {
             String[] repair_channel = {RepairDto.REPAIR_CHANNEL_STAFF, RepairDto.REPAIR_CHANNEL_TEL};
             ownerRepairDto.setRepairChannels(Arrays.asList(repair_channel));
@@ -114,6 +116,21 @@ public class ListOwnerRepairsCmd extends Cmd {
         context.setResponseEntity(responseEntity);
     }
 
+    private void ifHasTime(RepairDto ownerRepairDto) {
+
+        if (StringUtil.isEmpty(ownerRepairDto.getEndTime())) {
+            return;
+        }
+
+        String endTime = ownerRepairDto.getEndTime();
+        if (endTime.contains(":")) {
+            return;
+        }
+
+        endTime += " 23:59:59";
+        ownerRepairDto.setEndTime(endTime);
+    }
+
     private void hasOwnerId(JSONObject reqJson) {
         if (reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))) {
             OwnerDto ownerDto = new OwnerDto();