工单管理调整

linwei

2026-01-21 03773b5c567cba3f365b114c06c06604182779ab

工单管理调整

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml

@@ -73,25 +73,27 @@
        update_user,
        update_time,
        status,
        is_deleted
        from ja_gd_work_order
        is_deleted,
        bu.name create_user_name
        from ja_gd_work_order wo
            left join blade_user bu on wo.create_user = bu.id
        <where>
            <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
                and work_order_status like concat(#{param2.workOrderStatus},'%')
                and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
            </if>
            <if test="param2.workOrderName != null and param2.workOrderName != ''">
                and work_order_name like concat('%',#{param2.workOrderName},'%')
                and wo.work_order_name like concat('%',#{param2.workOrderName},'%')
            </if>
            <if test="param2.workOrderType != null and param2.workOrderType != ''">
                and work_order_type = #{param2.workOrderType}
                and wo.work_order_type = #{param2.workOrderType}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
                and wo.create_user = #{param2.createUser}
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
            </if>
            and is_deleted = 0
            and wo.is_deleted = 0
        </where>
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java

@@ -171,9 +171,11 @@
            case 1: // 接单
            case 7: // 同意修改
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
                workOrder.setServiceParty(AuthUtil.getUserName());
                break;
            case 2: // 拒接接单
                newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING;
                workOrder.setServiceParty(AuthUtil.getUserName());
                break;
            case 3: // 申请取消
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
@@ -183,15 +185,18 @@
                break;
            case 5: // 同意取消
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED;
                workOrder.setServiceParty(AuthUtil.getUserName());
                break;
            case 6: // 不同意取消
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
                break;
            case 8: // 不同意修改
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
                workOrder.setServiceParty(AuthUtil.getUserName());
                break;
            case 9: // 协商修改 --> 协商修改
                newStatusEnum = WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY;
                workOrder.setServiceParty(AuthUtil.getUserName());
                break;
            case 10: // 同意协商修改 --> 待拆分
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.workorder.vo;

import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,8 @@
public class GdWorkOrderVO extends GdWorkOrderEntity {
    private static final long serialVersionUID = 1L;


    @ApiModelProperty(value = "需求方名称")
    private String createUserName;

}