java110
2020-07-01 be073dcff49d3ca000602d0cd4c30f41a558f474
优化派单显示
3个文件已修改
15 ■■■■ 已修改文件
java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
    <insert id="saveBusinessRepairUserInfo" parameterType="Map">
        insert into business_repair_user(
        operate,context,repair_id,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
        pre_staff_name,repair_event,end_time
        pre_staff_name,repair_event,end_time,start_time
        ) values (
        #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
        #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime}
        #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime},#{startTime}
        )
    </insert>
@@ -133,7 +133,7 @@
        <if test="preStaffId !=null and preStaffId != ''">
            and t.pre_staff_id= #{preStaffId}
        </if>
        order by t.create_time
        order by t.start_time
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -148,7 +148,7 @@
        return getFormatTimeString(new Date(), pattern);
    }
    public static String getLastTime(){
    public static String getLastTime() {
        return LAST_TIME;
    }
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java
@@ -23,6 +23,8 @@
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/**
@@ -192,6 +194,7 @@
        // 自己的单子状态修改为转单
        RepairUserPo repairUserPo = new RepairUserPo();
        repairUserPo.setRuId("-1");
        repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        repairUserPo.setState(RepairUserDto.STATE_TRANSFER);
        repairUserPo.setRepairId(reqJson.getString("repairId"));
@@ -205,6 +208,10 @@
        //处理人信息
        repairUserPo = new RepairUserPo();
        repairUserPo.setRuId("-2");
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(new Date());
        calendar.add(Calendar.SECOND, 30);
        repairUserPo.setStartTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
        repairUserPo.setState(RepairUserDto.STATE_DOING);
        repairUserPo.setRepairId(reqJson.getString("repairId"));
        repairUserPo.setStaffId(reqJson.getString("staffId"));