增加检查字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckItemDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 
@@ -511,4 +512,10 @@ public class AcceptanceCheckItemDto extends BaseDto {
      * 组件倾斜角测试照片
      */
     private String assemblyDipAngleImage;
+
+
+    private  String  approvalStatus;//审核结果,0,1
+    private  String  operator;//操作人
+    private  String  operationTime;//操作时间
+    private  String  comment;//审核意见
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckItem.java

@@ -2,11 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 验收检查项
  */
@@ -619,14 +622,19 @@ public class AcceptanceCheckItem extends BaseEntity {
     private String assemblyDipAngleImage;
 
 
-    @TableField(exist = false)
+    @TableField("approval_status")
     private  String  approvalStatus;//审核结果,0,1
-    @TableField(exist = false)
+    @TableField("operator")
     private  String  operator;//操作人
-    @TableField(exist = false)
-    private  String  operationTime;//操作时间
-    @TableField(exist = false)
+    @TableField("operation_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date operationTime;//操作时间
+    @TableField("comment")
     private  String  comment;//审核意见
+
+
+
+
     //并网审核id
     @TableField(exist = false)
     private Long basicGridAcceptanceId;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -160,11 +160,18 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
             }
 
         }else{
+
             if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
                 basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
-            }else{
+            }else {
                 basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
             }
+
+
+
+
+
+
         }
 
         if(basicGridAcceptanc.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())){