调整返回审批信息

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteApprovalPlan.java

@@ -33,7 +33,7 @@ public class OnsiteApprovalPlan implements Serializable {
 	
 	@ApiModelProperty(value = "计划id")
 	private Long bentelerPlanId;
-	
+
 	@ApiModelProperty(value = "角色ID")
 	private Long approvalRole;
 
@@ -42,16 +42,20 @@ public class OnsiteApprovalPlan implements Serializable {
 
 	@ApiModelProperty(value = "审批人:操作的人")
 	private Long approvalUserId;
-	
+
+	@ApiModelProperty(value = "审批人姓名")
+	@TableField(exist = false)
+	private String approvalPerson;
+
 	@ApiModelProperty(value = "审批状态 0未审批 1审批通过 2驳回")
 	private Integer status;
-	
+
 	@ApiModelProperty(value = "审批意见")
 	private String reason;
-	
+
 	@TableField(fill = FieldFill.INSERT)
 
-    @ApiModelProperty(value = "创建时间")
+	@ApiModelProperty(value = "创建时间")
     private LocalDateTime createdTime;
 
     @TableField(fill = FieldFill.UPDATE)

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -336,6 +336,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 				pmPlan.setStatus(latestApprovalInfo.getStatus());
 				pmPlan.setReason(latestApprovalInfo.getReason());
 				pmPlan.setUpdatedTime(latestApprovalInfo.getUpdatedTime());
+				pmPlan.setApprovalPerson(latestApprovalInfo.getApprovalPerson());
 			}
 		}
         return ResponseBeanBuilder.ok(listResPage, Function.identity());

application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -311,7 +311,8 @@
         fair.val_desc,
         fair.prefix,
         fair.tool_desc,
-        fair.abnormal
+        fair.abnormal,
+        fair.order_number
         FROM first_article_item_result fair,
         first_article_task fat,
         first_article_item fai

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -344,7 +344,7 @@
                a.approval_user_id,
                a.reason,
                a.updated_time,
-               uu.username
+               uu.username as approvalPerson
         FROM onsite_approval_plan oap,
              (
                  SELECT oap.*