drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdWorkOrderFlowEntity.java
@@ -55,7 +55,7 @@ * 工单状态 */ @ApiModelProperty(value = "工单状态工单状态:0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算") private String workStatus; private Integer workStatus; /** * 关联工单任务表ID/巡查任务ID */ drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
@@ -124,10 +124,10 @@ } /** * 获取状态码 * * @return 状态码 */ * 获取状态码 * * @return 状态码 */ public String getCode() { return code; } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDevicePayloadMapper.xml
@@ -20,13 +20,14 @@ </resultMap> <select id="selectGdManageDevicePayloadPage" resultMap="gdManageDevicePayloadResultMap"> <select id="selectGdManageDevicePayloadPage" resultType="org.sxkj.gd.workorder.vo.GdManageDevicePayloadVO"> select * distinct name, type, sn_code as snCode from ja_gd_manage_device_payload where is_deleted = 0 group by name </select> drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -334,7 +334,8 @@ flowEntity.setOperator(AuthUtil.getNickName()); flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue()); flowEntity.setFlowStatus(newStatus.getMaxCode()); flowEntity.setWorkStatus(newStatus.getCode()); // 将String类型的状态码转换为Integer类型 flowEntity.setWorkStatus(Integer.valueOf(newStatus.getCode())); flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); return gdWorkOrderFlowService.save(flowEntity); } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -147,7 +147,8 @@ flowEntity.setOperator(AuthUtil.getNickName()); flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue()); flowEntity.setFlowStatus(newStatusEnum.getMaxCode()); flowEntity.setWorkStatus(newStatusEnum.getCode()); // 将String类型的状态码转换为Integer类型 flowEntity.setWorkStatus(Integer.valueOf(newStatusEnum.getCode())); flowEntity.setAreaCode(entity.getAreaCode()); flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); return gdWorkOrderFlowService.save(flowEntity); @@ -259,7 +260,8 @@ flowEntity.setOperator(AuthUtil.getNickName()); flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue()); flowEntity.setFlowStatus(newStatusEnum.getMaxCode()); flowEntity.setWorkStatus(newStatusEnum.getCode()); // 将String类型的状态码转换为Integer类型 flowEntity.setWorkStatus(Integer.valueOf(newStatusEnum.getCode())); flowEntity.setAreaCode(workOrder.getAreaCode()); flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); return gdWorkOrderFlowService.save(flowEntity);