优化报修代码暂存

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

@@ -15,6 +15,30 @@ import java.util.Date;
  **/
 public class RepairDto extends PageDto implements Serializable {
 
+    //待处理
+    public static final String STATE_WAIT = "1000";
+    //接单
+    public static final String STATE_TAKING = "1100";
+    //退单
+    public static final String STATE_BACK = "1200";
+    //转单
+    public static final String STATE_TRANSFER = "1300";
+
+    //申请支付
+    public static final String STATE_PAY = "1400";
+    //支付失败
+    public static final String STATE_PAY_ERROR = "1500";
+    //待评价
+    public static final String STATE_APPRAISE = "1700";
+    //待回访
+    public static final String STATE_RETURN_VISIT = "1800";
+    //办理完成
+    public static final String STATE_COMPLATE = "1900";
+    //未处理主动结单
+    public static final String STATE_UNPROCESSED = "2000";
+
+
+
     private String repairName;
     private String appointmentTime;
     private String repairType;
@@ -184,4 +208,5 @@ public class RepairDto extends PageDto implements Serializable {
     public void setRoomIds(String[] roomIds) {
         this.roomIds = roomIds;
     }
+
 }

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

@@ -19,6 +19,7 @@ public class RepairTypeUserDto extends PageDto implements Serializable {
 
     private String typeUserId;
     private String repairType;
+    private String repairTypeName;
     private String remark;
     private String state;
     private String stateName;
@@ -112,4 +113,12 @@ public class RepairTypeUserDto extends PageDto implements Serializable {
     public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
+
+    public String getRepairTypeName() {
+        return repairTypeName;
+    }
+
+    public void setRepairTypeName(String repairTypeName) {
+        this.repairTypeName = repairTypeName;
+    }
 }

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

@@ -15,6 +15,11 @@ import java.util.Date;
  **/
 public class RepairUserDto extends PageDto implements Serializable {
 
+    //开始用户
+    public static final String REPAIR_EVENT_START_USER = "startUser";
+    //审核用户
+    public static final String REPAIR_EVENT_AUDIT_USER = "auditUser";
+
     private String context;
     private String repairId;
     private String[] repairIds;
@@ -24,6 +29,14 @@ public class RepairUserDto extends PageDto implements Serializable {
     private String userId;
     private String userName;
 
+    private String staffId;
+    private String staffName;
+    private String preStaffId;
+    private String preStaffName;
+    private Date startTime;
+    private Date endTime;
+    private String repairEvent;
+
 
     private Date createTime;
 
@@ -110,4 +123,60 @@ public class RepairUserDto extends PageDto implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getPreStaffId() {
+        return preStaffId;
+    }
+
+    public void setPreStaffId(String preStaffId) {
+        this.preStaffId = preStaffId;
+    }
+
+    public String getPreStaffName() {
+        return preStaffName;
+    }
+
+    public void setPreStaffName(String preStaffName) {
+        this.preStaffName = preStaffName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getRepairEvent() {
+        return repairEvent;
+    }
+
+    public void setRepairEvent(String repairEvent) {
+        this.repairEvent = repairEvent;
+    }
 }

java110-bean/src/main/java/com/java110/po/owner/RepairPoolPo.java

@@ -23,6 +23,8 @@ public class RepairPoolPo implements Serializable {
 
     private String state;
 
+
+
     public String getRepairId() {
         return repairId;
     }
@@ -94,4 +96,6 @@ public class RepairPoolPo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+
 }

java110-bean/src/main/java/com/java110/po/owner/RepairUserPo.java

@@ -18,6 +18,14 @@ public class RepairUserPo implements Serializable {
     private String state;
     private String context;
 
+    private String staffId;
+    private String staffName;
+    private String preStaffId;
+    private String preStaffName;
+    private String startTime;
+    private String endTime;
+    private String repairEvent;
+
     public String getRuId() {
         return ruId;
     }
@@ -65,4 +73,60 @@ public class RepairUserPo implements Serializable {
     public void setContext(String context) {
         this.context = context;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getPreStaffId() {
+        return preStaffId;
+    }
+
+    public void setPreStaffId(String preStaffId) {
+        this.preStaffId = preStaffId;
+    }
+
+    public String getPreStaffName() {
+        return preStaffName;
+    }
+
+    public void setPreStaffName(String preStaffName) {
+        this.preStaffName = preStaffName;
+    }
+
+    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;
+    }
+
+    public String getRepairEvent() {
+        return repairEvent;
+    }
+
+    public void setRepairEvent(String repairEvent) {
+        this.repairEvent = repairEvent;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ownerRepair/ApiOwnerRepairDataVo.java

@@ -1,156 +0,0 @@
-package com.java110.vo.api.ownerRepair;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ApiOwnerRepairDataVo implements Serializable {
-
-    private String repairId;
-    private String repairType;
-    private String repairName;
-    private String tel;
-    private String roomId;
-    private String appointmentTime;
-    private String context;
-    private String state;
-    private String stateName;
-    private String repairTypeName;
-
-    private String staffId;
-
-    private String userId;
-    private String userName;
-
-    private String repairDispatchState;
-    private String repairDispatchContext;
-    private String repairDispatchStateName;
-
-    public String getRepairId() {
-        return repairId;
-    }
-
-    public void setRepairId(String repairId) {
-        this.repairId = repairId;
-    }
-
-    public String getRepairType() {
-        return repairType;
-    }
-
-    public void setRepairType(String repairType) {
-        this.repairType = repairType;
-    }
-
-    public String getRepairName() {
-        return repairName;
-    }
-
-    public void setRepairName(String repairName) {
-        this.repairName = repairName;
-    }
-
-    public String getTel() {
-        return tel;
-    }
-
-    public void setTel(String tel) {
-        this.tel = tel;
-    }
-
-    public String getRoomId() {
-        return roomId;
-    }
-
-    public void setRoomId(String roomId) {
-        this.roomId = roomId;
-    }
-
-    public String getAppointmentTime() {
-        return appointmentTime;
-    }
-
-    public void setAppointmentTime(String appointmentTime) {
-        this.appointmentTime = appointmentTime;
-    }
-
-    public String getContext() {
-        return context;
-    }
-
-    public void setContext(String context) {
-        this.context = context;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getStateName() {
-        return stateName;
-    }
-
-    public void setStateName(String stateName) {
-        this.stateName = stateName;
-    }
-
-    public String getRepairTypeName() {
-        return repairTypeName;
-    }
-
-    public void setRepairTypeName(String repairTypeName) {
-        this.repairTypeName = repairTypeName;
-    }
-
-
-    public String getStaffId() {
-        return staffId;
-    }
-
-    public void setStaffId(String staffId) {
-        this.staffId = staffId;
-    }
-
-    public String getRepairDispatchState() {
-        return repairDispatchState;
-    }
-
-    public void setRepairDispatchState(String repairDispatchState) {
-        this.repairDispatchState = repairDispatchState;
-    }
-
-    public String getRepairDispatchContext() {
-        return repairDispatchContext;
-    }
-
-    public void setRepairDispatchContext(String repairDispatchContext) {
-        this.repairDispatchContext = repairDispatchContext;
-    }
-
-    public String getRepairDispatchStateName() {
-        return repairDispatchStateName;
-    }
-
-    public void setRepairDispatchStateName(String repairDispatchStateName) {
-        this.repairDispatchStateName = repairDispatchStateName;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

java110-bean/src/main/java/com/java110/vo/api/ownerRepair/ApiOwnerRepairVo.java

@@ -1,19 +0,0 @@
-package com.java110.vo.api.ownerRepair;
-
-import com.java110.vo.MorePageVo;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class ApiOwnerRepairVo extends MorePageVo implements Serializable {
-    List<ApiOwnerRepairDataVo> ownerRepairs;
-
-
-    public List<ApiOwnerRepairDataVo> getOwnerRepairs() {
-        return ownerRepairs;
-    }
-
-    public void setOwnerRepairs(List<ApiOwnerRepairDataVo> ownerRepairs) {
-        this.ownerRepairs = ownerRepairs;
-    }
-}

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

@@ -9,7 +9,8 @@
         insert into business_repair_type_user(
         operate,type_user_id,repair_type,remark,state,staff_name,b_id,community_id,staff_id
         ) values (
-        #{operate},#{typeUserId},#{repairType},#{remark},#{state},#{staffName},#{bId},#{communityId},#{staffId}
+        #{operate},#{typeUserId},#{repairType},#{remark},#{state},#{staffName},#{bId},#{communityId},
+        #{staffId}
         )
     </insert>
 
@@ -91,9 +92,11 @@
     <select id="getRepairTypeUserInfo" parameterType="Map" resultType="Map">
         select t.type_user_id,t.type_user_id typeUserId,t.repair_type,t.repair_type
         repairType,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.staff_name,t.staff_name staffName,t.b_id,t.b_id
-        bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId,d.name stateName
+        bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId,d.name stateName,rrs.repair_type_name repairTypeName,
+        t.create_time createTime
         from r_repair_type_user t
         left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_type_user' and d.table_columns = 'state'
+        left join r_repair_setting rrs on t.repair_type = rrs.repair_type and rrs.status_cd = '0'
         where 1 =1
         <if test="typeUserId !=null and typeUserId != ''">
             and t.type_user_id= #{typeUserId}
@@ -169,6 +172,7 @@
         select count(1) count
         from r_repair_type_user t
         left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_type_user' and d.table_columns = 'state'
+        left join r_repair_setting rrs on t.repair_type = rrs.repair_type and rrs.status_cd = '0'
         where 1 =1
         <if test="typeUserId !=null and typeUserId != ''">
             and t.type_user_id= #{typeUserId}

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

@@ -7,9 +7,11 @@
     <!-- 保存报修派单信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessRepairUserInfo" parameterType="Map">
         insert into business_repair_user(
-        operate,context,repair_id,ru_id,state,community_id,b_id,user_id
+        operate,context,repair_id,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
+        pre_staff_name,repair_event
         ) values (
-        #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{userId}
+        #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
+        #{staffName},#{preStaffId},#{preStaffName},#{repairEvent}
         )
     </insert>
 
@@ -17,7 +19,11 @@
     <!-- 查询报修派单信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessRepairUserInfo" parameterType="Map" resultType="Map">
         select t.operate,t.context,t.repair_id,t.repair_id repairId,t.ru_id,t.ru_id
-        ruId,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        ruId,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+        t.staff_id,t.staff_id staffId,t.staff_name,t.staff_name staffName,
+        t.pre_staff_id,t.pre_staff_id preStaffId,t.pre_staff_name,t.pre_staff_name preStaffName,
+        t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.repair_event,
+        t.repair_event repairEvent
         from business_repair_user t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -41,9 +47,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
 
     </select>
 
@@ -51,8 +54,11 @@
     <!-- 保存报修派单信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveRepairUserInfoInstance" parameterType="Map">
         insert into r_repair_user(
-        context,repair_id,status_cd,ru_id,state,community_id,b_id,user_id
-        ) select t.context,t.repair_id,'0',t.ru_id,t.state,t.community_id,t.b_id,t.user_id from business_repair_user t
+        context,repair_id,status_cd,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
+        pre_staff_name,repair_event,start_time,end_time,repair_event
+        ) select t.context,t.repair_id,'0',t.ru_id,t.state,t.community_id,t.b_id,t.staff_id,t.staff_name,
+        t.pre_staff_id,t.pre_staff_name,t.repair_event,t.start_time,t.end_time,t.repair_event
+        from business_repair_user t
         where 1=1
         and t.operate= 'ADD'
         <if test="context !=null and context != ''">
@@ -82,9 +88,14 @@
 
     <!-- 查询报修派单信息 add by wuxw 2018-07-03 -->
     <select id="getRepairUserInfo" parameterType="Map" resultType="Map">
-        select t.context,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,t.ru_id,t.ru_id
-        ruId,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        select t.context,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,
+        t.ru_id,t.ru_id ruId,t.state,t.community_id,t.community_id communityId,t.b_id,
+        t.b_id bId,t.staff_id,t.staff_id staffId,t.staff_name,t.staff_name staffName,
+        t.pre_staff_id,t.pre_staff_id preStaffId,t.pre_staff_name,t.pre_staff_name preStaffName,
+        t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,d.name stateName,
+        t.repair_event,t.repair_event repairEvent
         from r_repair_user t
+        left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_user' and d.table_columns = 'state'
         where 1 =1
         <if test="context !=null and context != ''">
             and t.context= #{context}
@@ -113,8 +124,14 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="repairEvent !=null and repairEvent != ''">
+            and t.repair_event= #{repairEvent}
+        </if>
+        <if test="preStaffId !=null and preStaffId != ''">
+            and t.pre_staff_id= #{preStaffId}
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -142,9 +159,13 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-        <if test="userId !=null and userId != ''">
-            , t.user_id= #{userId}
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
         </if>
+        <if test="end_time !=null ">
+            , t.end_time= #{end_time}
+        </if>
+
         where 1=1
         <if test="ruId !=null and ruId != ''">
             and t.ru_id= #{ruId}
@@ -160,12 +181,20 @@
         select count(1) count
         from r_repair_user t
         where 1 =1
+        left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_user' and d.table_columns = 'state'
+        where 1 =1
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
         <if test="repairId !=null and repairId != ''">
             and t.repair_id= #{repairId}
         </if>
+        <if test="repairIds !=null">
+            and t.repair_id in
+            <foreach collection="repairIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -181,8 +210,14 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="repairEvent !=null and repairEvent != ''">
+            and t.repair_event= #{repairEvent}
+        </if>
+        <if test="preStaffId !=null and preStaffId != ''">
+            and t.pre_staff_id= #{preStaffId}
         </if>
 
 

service-api/src/main/java/com/java110/api/bmo/repair/impl/RepairTypeUserBMOImpl.java

@@ -6,6 +6,7 @@ import com.java110.api.bmo.repair.IRepairTypeUserBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.repairTypeUser.IRepairTypeUserInnerServiceSMO;
 import com.java110.po.repair.RepairTypeUserPo;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;

service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java

@@ -4,19 +4,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.core.smo.community.IRepairInnerServiceSMO;
 import com.java110.core.smo.community.IRepairUserInnerServiceSMO;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
-import com.java110.vo.api.ownerRepair.ApiOwnerRepairDataVo;
-import com.java110.vo.api.ownerRepair.ApiOwnerRepairVo;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
@@ -79,32 +77,27 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
 
         int count = repairInnerServiceSMOImpl.queryRepairsCount(ownerRepairDto);
 
-        List<ApiOwnerRepairDataVo> ownerRepairs = null;
 
+        List<RepairDto> ownerRepairs = null;
         if (count > 0) {
-            ownerRepairs = BeanConvertUtil.covertBeanList(repairInnerServiceSMOImpl.queryRepairs(ownerRepairDto), ApiOwnerRepairDataVo.class);
+            ownerRepairs = repairInnerServiceSMOImpl.queryRepairs(ownerRepairDto);
 
             refreshStaffName(ownerRepairs);
         } else {
             ownerRepairs = new ArrayList<>();
         }
 
-        ApiOwnerRepairVo apiOwnerRepairVo = new ApiOwnerRepairVo();
-
-        apiOwnerRepairVo.setTotal(count);
-        apiOwnerRepairVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiOwnerRepairVo.setOwnerRepairs(ownerRepairs);
+        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(count, (int) Math.ceil((double) count / (double) reqJson.getInteger("row")), ownerRepairs);
 
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerRepairVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
 
     }
 
-    private void refreshStaffName(List<ApiOwnerRepairDataVo> ownerRepairs) {
+    private void refreshStaffName(List<RepairDto> ownerRepairs) {
 
         List<String> repairIds = new ArrayList<>();
-        for (ApiOwnerRepairDataVo apiOwnerRepairDataVo : ownerRepairs) {
+        for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
             repairIds.add(apiOwnerRepairDataVo.getRepairId());
         }
 
@@ -115,11 +108,11 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
         repairUserDto.setRepairIds(repairIds.toArray(new String[repairIds.size()]));
         List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
 
-        for(RepairUserDto tmpRepairUserDto : repairUserDtos){
-            for(ApiOwnerRepairDataVo apiOwnerRepairDataVo : ownerRepairs){
-                if(tmpRepairUserDto.getRepairId().equals(apiOwnerRepairDataVo.getRepairId())){
-                    apiOwnerRepairDataVo.setUserId(tmpRepairUserDto.getUserId());
-                    apiOwnerRepairDataVo.setUserName(tmpRepairUserDto.getUserName());
+        for (RepairUserDto tmpRepairUserDto : repairUserDtos) {
+            for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
+                if (tmpRepairUserDto.getRepairId().equals(apiOwnerRepairDataVo.getRepairId())) {
+                    apiOwnerRepairDataVo.setStaffId(tmpRepairUserDto.getUserId());
+                    //apiOwnerRepairDataVo.setStatmpRepairUserDto.getUserName());
                 }
             }
         }

service-api/src/main/java/com/java110/api/listener/repair/DeleteRepairTypeUserListener.java

@@ -27,6 +27,7 @@ public class DeleteRepairTypeUserListener extends AbstractServiceApiPlusListener
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "typeUserId", "typeUserId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
 
     }
 

service-api/src/main/java/com/java110/api/listener/repair/UpdateRepairTypeUserListener.java

@@ -25,8 +25,7 @@ public class UpdateRepairTypeUserListener extends AbstractServiceApiPlusListener
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "typeUserId", "typeUserId不能为空");
-        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
-        Assert.hasKeyAndValue(reqJson, "userName", "请求报文中未包含userName");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含状态");
         Assert.hasKeyAndValue(reqJson, "repairType", "请求报文中未包含repairType");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 

service-api/src/main/java/com/java110/api/listener/room/QueryRoomsListener.java

@@ -21,6 +21,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -63,10 +64,13 @@ public class QueryRoomsListener extends AbstractServiceApiDataFlowListener {
         //查询总记录数
         int total = roomInnerServiceSMOImpl.queryRoomsCount(BeanConvertUtil.covertBean(reqJson, RoomDto.class));
         apiRoomVo.setTotal(total);
+        List<RoomDto> roomDtoList = null;
         if (total > 0) {
-            List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
-            apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
+            roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
+        }else{
+            roomDtoList = new ArrayList<>();
         }
+        apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
         int row = reqJson.getInteger("row");
         apiRoomVo.setRecords((int) Math.ceil((double) total / (double) row));
 

service-community/src/main/java/com/java110/community/listener/repair/AbstractRepairUserBusinessServiceDataFlowListener.java

@@ -2,8 +2,8 @@ package com.java110.community.listener.repair;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.community.dao.IRepairUserServiceDao;
-import com.java110.entity.center.Business;
 import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
+import com.java110.entity.center.Business;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
@@ -43,7 +43,14 @@ public abstract class AbstractRepairUserBusinessServiceDataFlowListener extends
         businessRepairUserInfo.put("ruId", businessRepairUserInfo.get("ru_id"));
         businessRepairUserInfo.put("state", businessRepairUserInfo.get("state"));
         businessRepairUserInfo.put("communityId", businessRepairUserInfo.get("community_id"));
-        businessRepairUserInfo.put("userId", businessRepairUserInfo.get("user_id"));
+        businessRepairUserInfo.put("staffId", businessRepairUserInfo.get("staff_id"));
+        businessRepairUserInfo.put("staffName", businessRepairUserInfo.get("staff_name"));
+        businessRepairUserInfo.put("preStaffId", businessRepairUserInfo.get("pre_staff_id"));
+        businessRepairUserInfo.put("preStaffName", businessRepairUserInfo.get("pre_staff_name"));
+        businessRepairUserInfo.put("startTime", businessRepairUserInfo.get("start_time"));
+        businessRepairUserInfo.put("endTime", businessRepairUserInfo.get("end_time"));
+        businessRepairUserInfo.put("repairEvent", businessRepairUserInfo.get("repair_event"));
+
         businessRepairUserInfo.remove("bId");
         businessRepairUserInfo.put("statusCd", statusCd);
     }
@@ -74,7 +81,13 @@ public abstract class AbstractRepairUserBusinessServiceDataFlowListener extends
         currentRepairUserInfo.put("ruId", currentRepairUserInfo.get("ru_id"));
         currentRepairUserInfo.put("state", currentRepairUserInfo.get("state"));
         currentRepairUserInfo.put("communityId", currentRepairUserInfo.get("community_id"));
-        currentRepairUserInfo.put("userId", currentRepairUserInfo.get("user_id"));
+        currentRepairUserInfo.put("staffId", currentRepairUserInfo.get("staff_id"));
+        currentRepairUserInfo.put("staffName", currentRepairUserInfo.get("staff_name"));
+        currentRepairUserInfo.put("preStaffId", currentRepairUserInfo.get("pre_staff_id"));
+        currentRepairUserInfo.put("preStaffName", currentRepairUserInfo.get("pre_staff_name"));
+        currentRepairUserInfo.put("startTime", currentRepairUserInfo.get("start_time"));
+        currentRepairUserInfo.put("endTime", currentRepairUserInfo.get("end_time"));
+        currentRepairUserInfo.put("repairEvent", currentRepairUserInfo.get("repair_event"));
 
 
         currentRepairUserInfo.put("operate", StatusConstant.OPERATE_DEL);