提交并网代码

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: keyong
+ * @createDate: 2024/01/16
+ */
+@Getter
+@AllArgsConstructor
+public enum GridStatusEnum {
+
+
+    DDJ("待登记", "1"),
+
+    DSH("待审核", "2"),
+
+    YWC("已完成", "3"),
+
+    WTG("未通过", "4");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static GridStatusEnum getNodeByCode(String code) {
+        GridStatusEnum gridStatusEnum = null;
+        for(GridStatusEnum type: GridStatusEnum.values()) {
+            if (type.getCode().equals(code)) {
+                gridStatusEnum = type;
+                break;
+            }
+        }
+        return gridStatusEnum;
+    }
+
+}

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

@@ -48,4 +48,23 @@ public class BasicGridAcceptanceDto extends BaseDto {
 
     @ApiModelProperty(value = "下一个节点小程序路由")
     private String nextNodeRoute;
+
+    @ApiModelProperty(value = "电站编号")
+    private String powerStationCode;
+
+    @ApiModelProperty(value = "户主姓名")
+    private String ownersName;
+
+    @ApiModelProperty(value = "电站类型")
+    private String powerStationType;
+
+    @ApiModelProperty(value = "项目地址")
+    private String projectAddress;
+
+    @ApiModelProperty(value = "并网日期")
+    private String gridConnectionTime;
+
+    @ApiModelProperty(value = "状态")
+    private String gridStatus;
+
 }

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

@@ -42,7 +42,7 @@ public class BasicGridAcceptance extends BaseEntity {
      * 并网状态
      */
     @TableField("grid_status")
-    private String stringQuantity;
+    private String gridStatus;
 
     /**
      * 验收状态

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridAcceptanceMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-01-16
+ */
 public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptance> {
+
+
+    PeasantHousehold getStationInfoById(@Param("id") Long id);
+
+    List<BasicGridAcceptanceDto> selectPageList(@Param("map") Map<String, Object> map);
 }

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

@@ -2,5 +2,56 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper">
 
+    <select id="getStationInfoById" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid">
+        SELECT
+            hph.*
+        FROM
+            hygf_on_grid_and_acceptance hogaa
+        LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hogaa.peasant_household_id
+        WHERE
+            hogaa.peasant_household_id = #{id}
+    </select>
 
+    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
+        SELECT
+            hogaa
+            hps.power_station_code AS powerStationCode,
+            hph.owners_name AS ownersName,
+            hps.power_station_type AS powerStationType,
+            hps.power_station_type AS projectAddress,
+            DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') AS gridConnectionTime,
+            CASE WHEN hbga.grid_status = '1' THEN '待登记'
+                WHEN hbga.grid_status = '2' THEN '待审核'
+                WHEN hbga.grid_status = '3' THEN '已完成'
+                ELSE '未通过' END AS gridStatus,
+            CASE WHEN hbga.grid_status = '2' THEN '待审核'
+                WHEN hbga.grid_status = '3' THEN '已完成'
+                ELSE '未通过' END AS gridCheckStatus
+        FROM
+            hygf_basic_grid_acceptance hbga
+            LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
+            LEFT JOIN hygf_on_grid_and_acceptance hogaa ON hogaa.work_order_power_station_id = hbga.work_order_power_station_id
+            LEFT JOIN hygf_power_station hps ON hps.peasant_household_id = hph.sequence_nbr
+        <where>
+            hogaa.is_delete = 0
+            <if test="map.formType != null and map.formType!=''">
+                AND hbga.grid_status IN ('2', '3', '4')
+            </if>
+            <if test="map.projectAddress != null and map.projectAddress!=''">
+                AND hph.project_address LIKE concat(concat("%", #{map.projectAddress}), "%")
+            </if>
+            <if test="map.powerStationCode != null and map.powerStationCode !=''">
+                AND hps.power_station_code LIKE concat(concat("%", #{map.powerStationCode}), "%")
+            </if>
+            <if test="map.ownersName != null and map.ownersName !=''">
+                AND hph.owners_name LIKE concat(concat("%", #{map.ownersName}), "%")
+            </if>
+            <if test="map.gridStatus != null and map.gridStatus !=''">
+                AND hbga.grid_status = #{map.gridStatus}
+            </if>
+            <if test="map.gridConnectionTime != null">
+                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT(map.gridConnectionTime, '%Y-%m-%d')
+            </if>
+        </where>
+    </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -7,7 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BasicGridAcceptanceServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -32,6 +43,10 @@ public class BasicGridAcceptanceController extends BaseController {
 
     @Autowired
     BasicGridAcceptanceServiceImpl basicGridAcceptanceServiceImpl;
+	@Autowired
+	BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+	@Autowired
+	HygfOnGridMapper onGridMapper;
 
     /**
      * 新增
@@ -41,9 +56,15 @@ public class BasicGridAcceptanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<BasicGridAcceptanceDto> save(@RequestBody BasicGridAcceptanceDto model) {
-	    model = basicGridAcceptanceServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<BasicGridAcceptanceDto> save(@RequestBody Map<String, BasicGridAcceptanceDto> model) {
+		BasicGridAcceptanceDto dto = model.get("gridAndAcceptanceInfo");
+//		PeasantHousehold household = basicGridAcceptanceMapper.getStationInfoById(dto.getWorkOrderPowerStationId());
+		dto.setGridStatus(GridStatusEnum.DDJ.getCode());
+		BasicGridAcceptanceDto basicGridAcceptanceDto = basicGridAcceptanceServiceImpl.updateWithModel(dto);
+		HygfOnGrid onGrid = new HygfOnGrid();
+		BeanUtils.copyProperties(dto, onGrid);
+		onGridMapper.updateById(onGrid);
+	    return ResponseHelper.buildResponse(basicGridAcceptanceDto);
 	}
 
 	/**
@@ -87,7 +108,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	}
 
 	/**
-     * 列表分页查询
+     * 经销商端列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
@@ -96,15 +117,39 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<BasicGridAcceptanceDto> page = new Page<BasicGridAcceptanceDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
+	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForPage(@RequestParam(value = "current") int current,
+																	@RequestParam(value = "size") int size,
+																	@RequestParam(value = "projectAddress") String projectAddress,
+																	@RequestParam(value = "powerStationCode") String powerStationCode,
+																	@RequestParam(value = "ownersName") String ownersName,
+																	@RequestParam(value = "gridStatus") String gridStatus,
+																	@RequestParam(value = "gridConnectionTime") Date gridConnectionTime) {
+	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
 	    return ResponseHelper.buildResponse(page);
 	}
 
 	/**
+	 * 审核管理端列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/check/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForCheckPage(@RequestParam(value = "current") int current,
+																	@RequestParam(value = "size") int size,
+																	@RequestParam(value = "projectAddress") String projectAddress,
+																	@RequestParam(value = "powerStationCode") String powerStationCode,
+																	@RequestParam(value = "ownersName") String ownersName,
+																	@RequestParam(value = "gridStatus") String gridStatus,
+																	@RequestParam(value = "gridConnectionTime") Date gridConnectionTime) {
+		Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
+		return ResponseHelper.buildResponse(page);
+	}
+
+	/**
 	 * 列表全部数据查询
      *
 	 * @return

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 @Service
 public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper> implements IBasicGridAcceptanceService {
+
+    @Autowired
+    BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+
+    public Page<BasicGridAcceptanceDto> selectPage(int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, Date gridConnectionTime, String formType) {
+        PageHelper.startPage(current, size);
+        Map<String, Object> map = new HashMap<>();
+        map.put("projectAddress", projectAddress);
+        map.put("powerStationCode", powerStationCode);
+        map.put("ownersName", ownersName);
+        map.put("gridStatus", gridStatus);
+        map.put("gridConnectionTime", gridConnectionTime);
+        map.put("formType", formType);
+        List<BasicGridAcceptanceDto> list = basicGridAcceptanceMapper.selectPageList(map);
+        PageInfo<BasicGridAcceptanceDto> page = new PageInfo(list);
+        Page<BasicGridAcceptanceDto> pageNew = new Page<>();
+        pageNew.setCurrent(current);
+        pageNew.setTotal(page.getTotal());
+        pageNew.setSize(size);
+        pageNew.setRecords(page.getList());
+        return pageNew;
+    }
 }