更新

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,18 @@ public class AcceptanceCheckItemDto extends BaseDto {
      * 组件倾斜角测试照片
      */
     private String assemblyDipAngleImage;
+
+    private  String  approvalStatus; //审核结果,0,1
+
+    private  String  operator; //操作人
+
+    private  String  operationTime; //操作时间
+
+    private  String  comment; //审核意见
+
+    //并网审核id
+    private Long basicGridAcceptanceId;
+
+    //并网登记id
+    private Long fonGridId;
 }

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

@@ -2,18 +2,21 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 验收检查项
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_acceptance_check_item")
+@TableName(value = "hygf_acceptance_check_item", autoResultMap = true)
 public class AcceptanceCheckItem extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -595,28 +598,28 @@ public class AcceptanceCheckItem extends BaseEntity {
     /**
      * 逆变器整体图
      */
-    @TableField("overall_image")
-    private String overallImage;
+    @TableField(value = "overall_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> overallImage;
     /**
      * 电表箱整体图
      */
-    @TableField("meter_box_overall_image")
-    private String meterBoxOverallImage;
+    @TableField(value = "meter_box_overall_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> meterBoxOverallImage;
     /**
      * 组件方阵图
      */
-    @TableField("assembly_array_image")
-    private String assemblyArrayImage;
+    @TableField(value = "assembly_array_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assemblyArrayImage;
     /**
      * 组件方位角测试照片
      */
-    @TableField("assembly_azimuth_image")
-    private String assemblyAzimuthImage;
+    @TableField(value = "assembly_azimuth_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assemblyAzimuthImage;
     /**
      * 组件倾斜角测试照片
      */
-    @TableField("assembly_dip_angle_image")
-    private String assemblyDipAngleImage;
+    @TableField(value = "assembly_dip_angle_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assemblyDipAngleImage;
 
 
     @TableField(exist = false)

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@@ -8,9 +7,9 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 验收整改单
@@ -21,7 +20,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_acceptance_rectification_order")
+@TableName(value = "hygf_acceptance_rectification_order", autoResultMap = true)
 public class AcceptanceRectificationOrder extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -96,5 +95,5 @@ public class AcceptanceRectificationOrder extends BaseEntity {
      * 整改照片
      */
 	@TableField(value = "rectification_photo", typeHandler = FastjsonTypeHandler.class)
-    private JSONArray rectificationPhoto;
+    private List<Object> rectificationPhoto;
 }

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

@@ -74,15 +74,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     @Override
     public Map<String, Object> acceptanceDetails(Long sequenceNbr) {
         Assert.notNull(sequenceNbr, "sequenceNbr不能为空");
-
         BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectById(sequenceNbr);
         Assert.notNull(basicGridAcceptance, "查询验收单不存在");
-
         Map<String, Object> result = new HashMap<>(2);
-        // 基本信息
-
-        result.put("basicInfo", new HashMap<>());
-
         // 检查项信息
         AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
                 Wrappers.<AcceptanceCheckItem>lambdaQuery()
@@ -91,7 +85,6 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
         BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
         result.put("checkItem", acceptanceCheckItemDto);
-
         return result;
     }