From e101402e91cb92ff5cd9abd05ed45a223d1849fc Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 22 七月 2024 18:06:40 +0800 Subject: [PATCH] 工单增加超时字段 --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 4 +++- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 1 + ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 3 +++ ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java b/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java index f19e97e..c3a8f6a 100644 --- a/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java +++ b/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java @@ -19,7 +19,6 @@ AUDITING("AUDITING", "瀹℃牳涓�"), AUDITING_SUCCESS("AUDITING_SUCCESS", "瀹℃牳閫氳繃"), AUDITING_FAIL("AUDITING_FAIL", "瀹℃牳涓嶉�氳繃"), - FINISH("FINISH", "宸插畬鎴�"), ; diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java index a1c7951..0bd7f2a 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java @@ -70,5 +70,7 @@ @TableField("processing_period") private Integer processingPeriod; - + @ApiModelProperty("鏄惁瓒呮椂锛�0娌℃湁 1瓒呮椂") + @TableField("overtime") + private Integer overtime; } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java index f8561fa..dda5d06 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java @@ -61,6 +61,9 @@ /** 杩愮淮妫�娴嬬粨鏋� */ private String ywCheckResult; + /** 0鏈秴鏃� 1瓒呮椂 */ + private Integer overtime; + public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) { if(vo == null) { vo = new WorkOrderVO(); diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index e4cd9e1..a9387f9 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -13,6 +13,7 @@ <result column="yw_result" property="ywResult"/> <result column="yw_condition" property="ywCondition"/> <result column="yw_check_result" property="ywCheckResult"/> + <result column="overtime" property="overtime"/> </resultMap> <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO"> -- Gitblit v1.8.0