diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MakeRec.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MakeRec.java index 973bb4bc..701b4070 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MakeRec.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MakeRec.java @@ -1,5 +1,6 @@ package org.springblade.desk.produce.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -28,6 +29,10 @@ public class MakeRec extends BaseEntity { @Schema(description = "操作工") private Long worker; + @Schema(description = "操作工") + @TableField(exist = false) + private String workerName; + @Schema(description = "报工日期") private Date makeTime; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml index 6a881b6b..2e27a589 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml @@ -64,6 +64,7 @@ LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID WHERE a.WO_ID = #{id} + ORDER BY a.ORDERS