Merge branch 'develop-QA'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java

@@ -171,6 +171,14 @@ public class InspectionTask extends BaseEntity {
      * [工序]名称
      */
     public static final String COL_PROCESS_NAME  = "PROCESS_NAME";
+    /**
+     * 额定工时(分钟)
+     */
+    public static final String COL_STANDARD_WORK_MINUTE =  "STANDARD_WORK_MINUTE";
+    /**
+     * 准备工时(分钟)
+     */
+    public static final String COL_PREPARE_WORK_MINUTE = "PREPARE_WORK_MINUTE";
 
     /**
      * [检验任务]编码
@@ -352,4 +360,14 @@ public class InspectionTask extends BaseEntity {
      */
     @Schema(description = "工序名称")
     private String processName;
+    /**
+     * 额定工时(分钟)
+     */
+    @Schema(description = "额定工时")
+    private Double standardWorkMinute;
+    /**
+     * 准备工时(分钟)
+     */
+    @Schema(description = "准备工时")
+    private Double prepareWorkMinute;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -48,6 +48,8 @@
         <result column="YIELD_ORDER_TYPE" property="yieldOrderType"/>
         <result column="YIELD_ORDER_ID" property="yieldOrderId"/>
         <result column="RECEIVE_DATE" property="receiveDate"/>
+        <result column="STANDARD_WORK_MINUTE" property="standardWorkMinute"/>
+        <result column="PREPARE_WORK_MINUTE" property="prepareWorkMinute"/>
     </resultMap>
 
     <select id="selectInspectionTaskPage" resultMap="inspectionTaskResultMap">