施工自审

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

@@ -42,4 +42,7 @@ public class ConstructionRecordsDto  extends BaseDto {
     @ApiModelProperty(value = "农户id")
     private Long peasantHouseholdId;
 
+
+    @ApiModelProperty(value = "备注")
+    private String  notes;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
-import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import lombok.Data;
 
 /**
@@ -14,10 +11,12 @@ import lombok.Data;
 @Data
 public class PowerStationEngineeringInfoAllDto {
 
-    // 基本信息
-    SurveyInformationDto surveyInformation;
+    //自审信息
 
+    ConstructionRecords constructionRecords;
 
+    // 基本信息
+    SurveyInformationDto surveyInformation;
 
     Long workOrderPowerStationId;
 
@@ -28,7 +27,6 @@ public class PowerStationEngineeringInfoAllDto {
     SurveyDetailsDto surveyDetails;
 
 
-
     // 扩展信息
     ExtendedInformationDto extendedInformation;
 

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

@@ -3,10 +3,12 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 施工日志
@@ -64,4 +66,28 @@ public class ConstructionRecords extends BaseEntity {
 	@TableField("peasant_household_id")
     private Long peasantHouseholdId;
 
+
+    @TableField("notes")
+    private String  notes;
+
+
+    public ConstructionRecords(String operator, String operationContent, Date operationTime, String operationResults, Long workOrderId, Long workOrderPowerStationId, Long peasantHouseholdId, String notes) {
+        this.operator = operator;
+        this.operationContent = operationContent;
+        this.operationTime = operationTime;
+        this.operationResults = operationResults;
+        this.workOrderId = workOrderId;
+        this.workOrderPowerStationId = workOrderPowerStationId;
+        this.peasantHouseholdId = peasantHouseholdId;
+        this.notes = notes;
+    }
+
+    public ConstructionRecords() {
+    }
+
+    @TableField(exist = false)
+    List<ConstructionRecords> constructionRecordsList;
+
+
+
 }

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

@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName(value ="hygf_on_grid",autoResultMap = true)
+@TableName(value ="hygf_on_grid_and_acceptance",autoResultMap = true)
 public class HygfOnGrid extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
+import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionRecords;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
@@ -272,9 +273,26 @@ public class WorkOrderController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "完工登记审核详情",   notes = "完工登记审核详情")
+    @GetMapping(value = "/getConstructionRecords")
+    public ResponseModel<PowerStationEngineeringInfoAllDto> getConstructionRecords(@RequestParam(value = "workOrderPowerStationId")Long workOrderPowerStationId) {
+
+        PowerStationEngineeringInfoAllDto returnDto = workOrderServiceImpl.getConstructionRecords(workOrderPowerStationId,getUserInfo().getRealName());
+        return ResponseHelper.buildResponse(returnDto);
+    }
 
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "完工登记审核",   notes = "完工登记审核")
+    @PostMapping(value = "/addConstructionRecords")
+    public ResponseModel<ConstructionRecords> addConstructionRecords( @RequestBody  PowerStationEngineeringInfoAllDto constructionRecords) {
+        ConstructionRecords da= constructionRecords.getConstructionRecords();
+        da.setWorkOrderPowerStationId(constructionRecords.getWorkOrderPowerStationId());
+        ConstructionRecords returnDto = workOrderServiceImpl.addConstructionRecords(da);
+        return ResponseHelper.buildResponse(returnDto);
+    }