Merge remote-tracking branch 'origin/developer' into developer

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

@@ -70,4 +70,8 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网日期
     private Date gridConnectionTime;
 
+
+    //并网登记id
+
+    private Long fOnGridId;
 }

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

@@ -14,6 +14,7 @@
 
     <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
         SELECT
+        hogaa.sequence_nbr fOnGridId,
         hbga.sequence_nbr sequenceNbr,
         hbga.work_order_id workOrderId,
         hbga.work_order_power_station_id workOrderPowerStationId,
@@ -30,6 +31,7 @@
                 WHEN hbga.grid_status = '2' THEN '待审核'
                 WHEN hbga.grid_status = '3' THEN '已完成'
                 ELSE '未通过' END AS gridStatus
+
         FROM
             hygf_basic_grid_acceptance hbga
             LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
@@ -37,6 +39,7 @@
             LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = hbga.work_order_id
         <where>
             hbga.is_delete = 0
+
             <if test="map.amosDealerId!=null and map.amosDealerId!=''">
                 and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
             </if>

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

@@ -183,4 +183,9 @@ public class BasicGridAcceptanceController extends BaseController {
 	public ResponseModel<List<BasicGridAcceptanceDto>> selectForList() {
 	    return ResponseHelper.buildResponse(Collections.emptyList());
 	}
+
+
+
+
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -30,7 +32,8 @@ public class HygfOnGridController extends BaseController {
 
     @Autowired
     HygfOnGridServiceImpl hygfOnGridServiceImpl;
-
+    @Autowired
+    HygfOnGridMapper hygfOnGridMapper;
     /**
      * 新增并网信息
      *
@@ -113,4 +116,18 @@ public class HygfOnGridController extends BaseController {
 	public ResponseModel<List<HygfOnGridDto>> selectForList() {
 	    return ResponseHelper.buildResponse(hygfOnGridServiceImpl.queryForHygfOnGridList());
 	}
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getHygfOnGridbyid")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网信息",  notes = "根据sequenceNbr查询单个并网信息")
+    public ResponseModel<HygfOnGrid> getHygfOnGridbyid(@RequestParam(required = false) Long sequenceNbr) {
+        HygfOnGrid da=new HygfOnGrid();
+	    if(sequenceNbr!=null){
+            da=  hygfOnGridMapper.selectById(sequenceNbr);
+        }
+        return ResponseHelper.buildResponse(da);
+    }
+
 }