xiugaibug 验收优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java

@@ -28,6 +28,7 @@ public enum ArrivalStateeEnum {
     施工中("施工中", "施工中"),
     施工完成 ("施工完成", "施工完成"),
     并网中("并网中", "并网中"),
+    验收中("验收中", "验收中"),
     并网完成("并网完成", "并网完成"),
     线上验收("线上验收", "线上验收"),
     线下验收("线下验收", "线下验收"),

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

@@ -52,4 +52,6 @@ public class AcceptanceCheckDto  extends BaseDto {
     @ApiModelProperty(value = "实例id")
     private String instanceId;
 
+    private String acceptanceTime;
+
 }

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

@@ -88,4 +88,11 @@ public class AcceptanceCheck extends BaseEntity {
     private String rectificationStatus;
 
 
+    /**
+     * 验收时间
+     */
+    @TableField("acceptance_time")
+    private String acceptanceTime;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -64,8 +64,8 @@
                 AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
             </if>
             <if test="map.type != null">
-                and ( hbga.grid_node  is not null
-                or hbga.grid_node = 'all'
+                and ( hbga.basic_grid_node  is not null
+                or hbga.basic_grid_node = 'all'
                 or hbga.power_station_area_status  is not null
                 or hbga.power_station_design_status  is not null
                 or hbga.power_station_engineering_status  is not null

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AcceptanceCheckServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -113,4 +117,65 @@ public class AcceptanceCheckController extends BaseController {
 	public ResponseModel<List<AcceptanceCheckDto>> selectForList() {
 	    return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.queryForAcceptanceCheckList());
 	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "验收-经销商管理",   notes = "验收经销商管理")
+	@PostMapping(value = "/completeAdminAudit")
+	@Transactional
+	public ResponseModel completeAdminAudit( @RequestBody Map<String,String> kv) {
+		acceptanceCheckServiceImpl.completeAdminAudit(kv);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "验收管理审核",   notes = "验收管理审核")
+	@PostMapping(value = "/completeAudit")
+	@Transactional
+	public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
+		return	acceptanceCheckServiceImpl.completeAudit(kv);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "整改单下发",   notes = "整改单下发")
+	@PostMapping(value = "/addRectification")
+	@Transactional
+	public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+
+
+		return	acceptanceCheckServiceImpl.addRectification(hygfReplenishment);
+
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "整改单添加信息",   notes = "整改单添加信息")
+	@PostMapping(value = "/nextTaskExcute")
+	@Transactional
+	public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+
+		return acceptanceCheckServiceImpl.nextTaskExcute(hygfReplenishment);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "整改单审核",   notes = "整改单审核")
+	@PostMapping(value = "/nextTaskAduit")
+	@Transactional
+	public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+
+		return	acceptanceCheckServiceImpl.nextTaskAduit(hygfReplenishment);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "PUT",value = "整改单作废",   notes = "整改单作废")
+	@PutMapping(value = "/rollback")
+	@Transactional
+	public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+
+
+		return acceptanceCheckServiceImpl.rollback(sequenceNbr);
+	}
+
 }