工单新增

linwei

2026-01-19 c23f42d3d9cb49fbf67cf58a9ada9729d7924403

工单新增

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java

@@ -92,7 +92,7 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入gdWorkOrder")
    public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
        return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
        return R.status(gdWorkOrderService.saveOrUpdateWorkOrder(workOrderParam));
    }
    //


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java

@@ -87,7 +87,7 @@
     * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
     */
    @ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
    private Byte taskStatus;
    private String taskStatus;
    /**
     * 区域编码
     */

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

@@ -17,6 +17,7 @@
package org.sxkj.gd.workorder.mapper;

import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.param.WorkOrderAddParam;
import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -58,4 +59,17 @@
     * @return
     */
    GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder);

    /**
     *
     * @param workOrderParam
     */
    Integer saveWorkOrder(@Param("workOrderParam") GdWorkOrderEntity workOrderParam);

    /**
     *
     * @param workOrderParam
     * @return
     */
    Integer updateWorkOrderById(@Param("workOrderParam") GdWorkOrderEntity workOrderParam);
}

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

@@ -122,75 +122,75 @@


    <!-- 自定义插入语句，使用ST_GeomFromText处理几何数据 -->
    <insert id="insert" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        INSERT INTO ja_gd_work_order (id, work_order_name, work_order_code, work_order_type,
    <insert id="saveWorkOrder" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        INSERT INTO ja_gd_work_order ( work_order_name, work_order_code, work_order_type,
                                      device_load_demand, recommend_device_ids, work_order_status,
                                      execute_start_time, execute_end_time, service_party,
                                      geom, remark, area_code,
                                      create_user, create_dept, create_time,
                                      update_user, update_time, status, is_deleted)
        VALUES (#{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
                #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
                #{executeStartTime}, #{executeEndTime}, #{serviceParty},
                ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
                #{createUser}, #{createDept}, #{createTime},
                #{updateUser}, #{updateTime}, #{status}, #{isDeleted})
        VALUES ( #{workOrderParam.workOrderName}, #{workOrderParam.workOrderCode}, #{workOrderParam.workOrderType},
                #{workOrderParam.deviceLoadDemand}, #{workOrderParam.recommendDeviceIds}, #{workOrderParam.workOrderStatus},
                #{workOrderParam.executeStartTime}, #{workOrderParam.executeEndTime}, #{workOrderParam.serviceParty},
                ST_GeomFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                #{workOrderParam.createUser}, #{workOrderParam.createDept}, #{workOrderParam.createTime},
                #{workOrderParam.updateUser}, #{workOrderParam.updateTime}, #{workOrderParam.status}, #{workOrderParam.isDeleted})
    </insert>

    <!-- 自定义更新语句，使用ST_GeomFromText处理几何数据 -->
    <!-- <update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity"> -->
    <!--     UPDATE ja_gd_work_order -->
    <!--     <set> -->
    <!--         <if test="workOrderName != null and workOrderName != ''"> -->
    <!--             work_order_name = #{workOrderName}, -->
    <!--         </if> -->
    <!--         <if test="workOrderCode != null and workOrderCode != ''"> -->
    <!--             work_order_code = #{workOrderCode}, -->
    <!--         </if> -->
    <!--         <if test="workOrderType != null and workOrderType != ''"> -->
    <!--             work_order_type = #{workOrderType}, -->
    <!--         </if> -->
    <!--         <if test="deviceLoadDemand != null and deviceLoadDemand != ''"> -->
    <!--             device_load_demand = #{deviceLoadDemand}, -->
    <!--         </if> -->
    <!--         <if test="recommendDeviceIds != null and recommendDeviceIds != ''"> -->
    <!--             recommend_device_ids = #{recommendDeviceIds}, -->
    <!--         </if> -->
    <!--         <if test="workOrderStatus != null"> -->
    <!--             work_order_status = #{workOrderStatus}, -->
    <!--         </if> -->
    <!--         <if test="executeStartTime != null"> -->
    <!--             execute_start_time = #{executeStartTime}, -->
    <!--         </if> -->
    <!--         <if test="executeEndTime != null"> -->
    <!--             execute_end_time = #{executeEndTime}, -->
    <!--         </if> -->
    <!--         <if test="serviceParty != null and serviceParty != ''"> -->
    <!--             service_party = #{serviceParty}, -->
    <!--         </if> -->
    <!--         <if test="geom != null and geom != ''"> -->
    <!--             geom = ST_GeomFromText(#{geom}), -->
    <!--         </if> -->
    <!--         <if test="remark != null and remark != ''"> -->
    <!--             remark = #{remark}, -->
    <!--         </if> -->
    <!--         <if test="areaCode != null and areaCode != ''"> -->
    <!--             area_code = #{areaCode}, -->
    <!--         </if> -->
    <!--         <if test="updateUser != null"> -->
    <!--             update_user = #{updateUser}, -->
    <!--         </if> -->
    <!--         <if test="updateTime != null"> -->
    <!--             update_time = #{updateTime}, -->
    <!--         </if> -->
    <!--         <if test="status != null"> -->
    <!--             status = #{status}, -->
    <!--         </if> -->
    <!--         <if test="isDeleted != null"> -->
    <!--             is_deleted = #{isDeleted}, -->
    <!--         </if> -->
    <!--     </set> -->
    <!--     WHERE id = #{id} -->
    <!-- </update> -->
    <update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        UPDATE ja_gd_work_order
        <set>
            <if test="workOrderParam.workOrderName != null and workOrderParam.workOrderName != ''">
                work_order_name = #{workOrderParam.workOrderName},
            </if>
            <if test="workOrderParam.workOrderCode != null and workOrderParam.workOrderCode != ''">
                work_order_code = #{workOrderParam.workOrderCode},
            </if>
            <if test="workOrderParam.workOrderType != null and workOrderParam.workOrderType != ''">
                work_order_type = #{workOrderParam.workOrderType},
            </if>
            <if test="workOrderParam.deviceLoadDemand != null and workOrderParam.deviceLoadDemand != ''">
                device_load_demand = #{workOrderParam.deviceLoadDemand},
            </if>
            <if test="workOrderParam.recommendDeviceIds != null and workOrderParam.recommendDeviceIds != ''">
                recommend_device_ids = #{workOrderParam.recommendDeviceIds},
            </if>
            <if test="workOrderParam.workOrderStatus != null">
                work_order_status = #{workOrderParam.workOrderStatus},
            </if>
            <if test="workOrderParam.executeStartTime != null">
                execute_start_time = #{workOrderParam.executeStartTime},
            </if>
            <if test="workOrderParam.executeEndTime != null">
                execute_end_time = #{workOrderParam.executeEndTime},
            </if>
            <if test="workOrderParam.serviceParty != null and workOrderParam.serviceParty != ''">
                service_party = #{workOrderParam.serviceParty},
            </if>
            <if test="workOrderParam.geom != null and workOrderParam.geom != ''">
                geom = ST_GeomFromText(#{workOrderParam.geom}),
            </if>
            <if test="workOrderParam.remark != null and workOrderParam.remark != ''">
                remark = #{workOrderParam.remark},
            </if>
            <if test="workOrderParam.areaCode != null and workOrderParam.areaCode != ''">
                area_code = #{workOrderParam.areaCode},
            </if>
            <if test="workOrderParam.updateUser != null">
                update_user = #{workOrderParam.updateUser},
            </if>
            <if test="workOrderParam.updateTime != null">
                update_time = #{workOrderParam.updateTime},
            </if>
            <if test="workOrderParam.status != null">
                status = #{workOrderParam.status},
            </if>
            <if test="workOrderParam.isDeleted != null">
                is_deleted = #{workOrderParam.isDeleted},
            </if>
        </set>
        WHERE id = #{workOrderParam.id}
    </update>

</mapper>

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java

@@ -8,6 +8,7 @@

@Data
public class GdPatrolTaskAddParam {

    /**
     * 关联工单任务表ID
     */
@@ -21,7 +22,7 @@
    /**
     * 巡查任务类型（巡查类/安检类等）
     */
    @ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）")
    @ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
    private String patrolTaskType;
    /**
     * 执行时间
@@ -52,6 +53,6 @@
    /**
     * 状态：0草稿、1待签收、2拒绝签收、3待审核
     */
    @ApiModelProperty(value = "状态：0草稿、1待签收、2拒绝签收、3待审核")
    private Byte taskStatus;
    @ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
    private String taskStatus;
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskPageParam.java

@@ -7,6 +7,12 @@
public class GdPatrolTaskPageParam {

    /**
     * 关联工单任务表ID
     */
    @ApiModelProperty(value = "关联工单任务表ID")
    private Long workOrderId;

    /**
     * 巡查任务名称
     */
    @ApiModelProperty(value = "巡查任务名称")

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

@@ -59,7 +59,7 @@
     * @param workOrderParam
     * @return
     */
    boolean saveWorkOrder(@Valid WorkOrderAddParam workOrderParam);
    boolean saveOrUpdateWorkOrder(@Valid WorkOrderAddParam workOrderParam);

    /**
     * 处理工单状态变更（接单或拒接接单）

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

@@ -132,7 +132,7 @@
        }

        // 4. 更新任务状态
        task.setTaskStatus(Byte.valueOf(auditStatus));
        task.setTaskStatus(auditStatus);
        boolean updateResult = updateById(task);
        if (!updateResult) {
            throw new RuntimeException("更新任务状态失败");

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

@@ -72,7 +72,7 @@
    @Override
    public List<GdWorkOrderExcel> exportGdWorkOrder(Wrapper<GdWorkOrderEntity> queryWrapper) {
        List<GdWorkOrderExcel> gdWorkOrderList = baseMapper.exportGdWorkOrder(queryWrapper);
        //gdWorkOrderList.forEach(gdWorkOrder -> {
        // gdWorkOrderList.forEach(gdWorkOrder -> {
        //    gdWorkOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdWorkOrder.getType()));
        //});
        return gdWorkOrderList;
@@ -80,12 +80,13 @@

    /**
     * 保存工单任务表
     *
     * @param workOrderParam
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveWorkOrder(WorkOrderAddParam workOrderParam) {
    public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
        GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));

        // 验证并格式化几何数据
@@ -104,11 +105,21 @@
            String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
            entity.setWorkOrderCode(WordOrderConstant.ORDER_PREFIX + timestamp);
        }
        entity.setCreateUser(AuthUtil.getUserId());
        entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
        boolean save = save(entity);
        Integer save = 0;
        if (entity.getId() != null) {
            entity.setUpdateUser(AuthUtil.getUserId());
            entity.setUpdateTime(new Date());
            save = baseMapper.updateWorkOrderById(entity);
        } else {
            entity.setCreateUser(AuthUtil.getUserId());
            entity.setCreateTime(new Date());
            entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
            entity.setStatus(1);
            entity.setIsDeleted(0);
            save = baseMapper.saveWorkOrder(entity);
        }
        // 保存成功
        if (save){
        if (save > 0) {
            // 保存流转记录
            GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
@@ -128,6 +139,7 @@

    /**
     * 处理工单状态变更（接单或拒接接单）
     *
     * @param statusParam
     * @return
     */
@@ -160,7 +172,7 @@
            // 拒接接单操作：更新状态为发布中_拒绝接单（11）
            newStatus = WorkOrderStatusEnum.PUBLISHING_REJECTING.getCode();
            flowName = WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc();
            flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS) ;
            flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS);
        } else {
            // 无效的操作类型
            return false;
@@ -170,6 +182,7 @@
        workOrder.setWorkOrderStatus(newStatus);
        workOrder.setUpdateUser(AuthUtil.getUserId());
        workOrder.setUpdateTime(new Date());
        workOrder.setGeom(null);
        boolean update = updateById(workOrder);

        // 更新成功，保存流转记录