drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -87,7 +87,7 @@ <if test="param2.workOrderType != null and param2.workOrderType != ''"> and wo.work_order_type = #{param2.workOrderType} </if> <if test="param2.createUser != null and param2.createUser != ''"> <if test="param2.createUser != null "> and wo.create_user = #{param2.createUser} </if> <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''"> drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -171,11 +171,11 @@ case 1: // 接单 case 7: // 同意修改 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; workOrder.setServiceParty(AuthUtil.getUserName()); workOrder.setServiceParty(AuthUtil.getNickName()); break; case 2: // 拒接接单 newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING; workOrder.setServiceParty(AuthUtil.getUserName()); workOrder.setServiceParty(AuthUtil.getNickName()); break; case 3: // 申请取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL; @@ -185,18 +185,18 @@ break; case 5: // 同意取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED; workOrder.setServiceParty(AuthUtil.getUserName()); workOrder.setServiceParty(AuthUtil.getNickName()); break; case 6: // 不同意取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL; break; case 8: // 不同意修改 newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY; workOrder.setServiceParty(AuthUtil.getUserName()); workOrder.setServiceParty(AuthUtil.getNickName()); break; case 9: // 协商修改 --> 协商修改 newStatusEnum = WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY; workOrder.setServiceParty(AuthUtil.getUserName()); workOrder.setServiceParty(AuthUtil.getNickName()); break; case 10: // 同意协商修改 --> 待拆分 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -99,4 +99,25 @@ @ApiModelProperty("主键id") private Long id; @ApiModelProperty(value = "创建人") private Long createUser; @ApiModelProperty(value = "创建部门") private Long createDept; @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "更新人") private Long updateUser; @ApiModelProperty(value = "更新时间") private Date updateTime; @ApiModelProperty(value = "状态") private Integer status; @ApiModelProperty(value = "逻辑删除") private Integer isDeleted; } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
@@ -97,4 +97,25 @@ @ApiModelProperty(value = "需求方名称") private String createUserName; @ApiModelProperty(value = "创建人") private Long createUser; @ApiModelProperty(value = "创建部门") private Long createDept; @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "更新人") private Long updateUser; @ApiModelProperty(value = "更新时间") private Date updateTime; @ApiModelProperty(value = "状态") private Integer status; @ApiModelProperty(value = "逻辑删除") private Integer isDeleted; }