feat: 提交验收管理相关接口

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 验收状态枚举
+ */
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("ALL")
+public enum AcceptanceStatusEnum {
+
+    待提交验收("待提交验收", 0),
+
+    待投融验收("待投融验收", 1),
+
+    投融验收不通过("投融验收不通过", 2),
+
+    待法务验收("待法务验收", 3),
+
+    法务验收不通过("法务验收不通过", 4),
+
+    待工程验收("待工程验收", 5),
+
+    工程验收不通过("工程验收不通过", 6),
+
+    待线下验收("待线下验收", 7),
+
+    线下验收不通过("线下验收不通过", 8),
+
+    验收完成("验收完成", 9);
+
+
+    /**
+     * 名称，描述
+     */
+    private final String name;
+    /**
+     * 编码
+     */
+    private final int code;
+
+    public static AcceptanceStatusEnum getNodeByCode(int code) {
+        AcceptanceStatusEnum acceptanceStatusEnum = null;
+        for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
+            if (type.getCode() == code) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "AcceptanceDto", description = "验收管理DTO")
+public class AcceptanceDto extends BaseDto {
+    @ApiModelProperty(value = "电站编号")
+    private String powerStationCode;
+
+    @ApiModelProperty(value = "业主姓名")
+    private String ownersName;
+
+    @ApiModelProperty(value = "项目地址")
+    private String projectAddress;
+
+    @ApiModelProperty(value = "服务代理商")
+    private String serviceAgent;
+
+    @ApiModelProperty(value = "提交日期")
+    private Date submitDate;
+
+    @ApiModelProperty(value = "整改单数量")
+    private Integer rectificationOrderCount;
+
+    @ApiModelProperty(value = "验收状态")
+    private String acceptanceStatus;
+
+    @ApiModelProperty(value = "验收状态描述")
+    private String acceptanceStatusDesc;
+
+    @ApiModelProperty(value = "整改状态")
+    private String rectificationStatus;
+
+    @ApiModelProperty(value = "整改状态描述")
+    private String rectificationStatusDesc;
+}

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

@@ -20,7 +20,6 @@ public class AcceptanceRectificationOrderDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "整改单号")
     private String rectificationOrderCode;
 
@@ -36,8 +35,11 @@ public class AcceptanceRectificationOrderDto  extends BaseDto {
     @ApiModelProperty(value = "问题描述")
     private String problemDescription;
 
-    @ApiModelProperty(value = "整改结果")
-    private String rectificationResult;
+    @ApiModelProperty(value = "整改状态")
+    private String rectificationStatus;
+
+    @ApiModelProperty(value = "整改状态描述")
+    private String rectificationStatusDesc;
 
     @ApiModelProperty(value = "整改描述")
     private String rectificationDescription;
@@ -57,4 +59,13 @@ public class AcceptanceRectificationOrderDto  extends BaseDto {
     @ApiModelProperty(value = "整改照片")
     private String rectificationPhoto;
 
+    @ApiModelProperty(value = "电站编号")
+    private String powerStationCode;
+
+    @ApiModelProperty(value = "户主姓名")
+    private String ownersName;
+
+    @ApiModelProperty(value = "电站地址")
+    private String powerStationAddress;
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
- * 
- *
- * @author system_generator
- * @date 2024-01-16
+ * 基础并网验收表
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="BasicGridAcceptanceDto", description="")
-public class BasicGridAcceptanceDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
+@ApiModel(value="BasicGridAcceptanceDto", description="基础并网验收DTO")
+public class BasicGridAcceptanceDto extends BaseDto {
 
-
-    @ApiModelProperty(value = "施工单id")
+    @ApiModelProperty(value = "施工单ID")
     private Long workOrderId;
 
-    @ApiModelProperty(value = "施工电站id")
+    @ApiModelProperty(value = "施工电站ID")
     private Long workOrderPowerStationId;
 
-    @ApiModelProperty(value = "农户id")
+    @ApiModelProperty(value = "农户ID")
     private Long peasantHouseholdId;
 
     @ApiModelProperty(value = "并网状态")
-    private String gridStatus;
+    private String stringQuantity;
 
     @ApiModelProperty(value = "验收状态")
     private String acceptanceStatus;
 
+    @ApiModelProperty(value = "验收时间")
+    protected Date acceptanceRecDate;
+
     @ApiModelProperty(value = "工作流实例ID")
     private String instanceId;
 
-    @ApiModelProperty(value = "下一个节点角色权限")
-    private String nextExecutorIds;
-
-    @ApiModelProperty(value = "任务发起人id")
-    private String promoter;
-
-    @ApiModelProperty(value = "流程下一节点id")
-    private String nextTaskId;
-
-    @ApiModelProperty(value = "下一节点可执行人逗号分割")
-    private String nextExecuteUserIds;
-
-    @ApiModelProperty(value = "工作流发起人id")
-    private String createUserId;
-
-    @ApiModelProperty(value = "下个节点名称")
-    private String nextNodeName;
-
-    @ApiModelProperty(value = "下个节点key")
+    @ApiModelProperty(value = "下一个节点节点标识")
     private String nextNodeKey;
 
+    @ApiModelProperty(value = "下一个节点角色权限")
+    private String nextNodeRolePermission;
+
+    @ApiModelProperty(value = "下一个节点小程序路由")
+    private String nextNodeRoute;
 }

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

@@ -53,10 +53,10 @@ public class AcceptanceRectificationOrder extends BaseEntity {
     private String problemDescription;
 
     /**
-     * 整改结果
+     * 整改状态
      */
-	@TableField("rectification_result")
-    private String rectificationResult;
+	@TableField("rectification_status")
+    private String rectificationStatus;
 
     /**
      * 整改描述

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
- * 
- *
- * @author system_generator
- * @date 2024-01-16
+ * 基础并网验收表
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("hygf_basic_grid_acceptance")
 public class BasicGridAcceptance extends BaseEntity {
-
     private static final long serialVersionUID = 1L;
 
     /**
-     * 施工单id
+     * 施工单ID
      */
-	@TableField("work_order_id")
+    @TableField("work_order_id")
     private Long workOrderId;
 
     /**
-     * 施工电站id
+     * 施工电站ID
      */
-	@TableField("work_order_power_station_id")
+    @TableField("work_order_power_station_id")
     private Long workOrderPowerStationId;
 
     /**
-     * 农户id
+     * 农户ID
      */
-	@TableField("peasant_household_id")
+    @TableField("peasant_household_id")
     private Long peasantHouseholdId;
 
     /**
      * 并网状态
      */
-	@TableField("grid_status")
-    private String gridStatus;
+    @TableField("grid_status")
+    private String stringQuantity;
 
     /**
      * 验收状态
      */
-	@TableField("acceptance_status")
+    @TableField("acceptance_status")
     private String acceptanceStatus;
 
     /**
-     * 工作流实例ID
-     */
-	@TableField("instance_id")
-    private String instanceId;
-
-    /**
-     * 下一个节点角色权限
-     */
-	@TableField("next_executor_ids")
-    private String nextExecutorIds;
-
-    /**
-     * 任务发起人id
+     * 验收时间
      */
-	@TableField("promoter")
-    private String promoter;
+    @TableField("acceptance_rec_date")
+    protected Date acceptanceRecDate;
 
     /**
-     * 流程下一节点id
-     */
-	@TableField("next_task_id")
-    private String nextTaskId;
-
-    /**
-     * 下一节点可执行人逗号分割
+     * 工作流实例ID
      */
-	@TableField("next_execute_user_ids")
-    private String nextExecuteUserIds;
+    @TableField("instance_id")
+    private String instanceId;
 
     /**
-     * 工作流发起人id
+     * 下一个节点节点标识
      */
-	@TableField("create_user_id")
-    private String createUserId;
+    @TableField("next_node_key")
+    private String nextNodeKey;
 
     /**
-     * 下个节点名称
+     * 下一个节点角色权限
      */
-	@TableField("next_node_name")
-    private String nextNodeName;
+    @TableField("next_node_role_permission")
+    private String nextNodeRolePermission;
 
     /**
-     * 下个节点key
+     * 下一个节点小程序路由
      */
-	@TableField("next_node_key")
-    private String nextNodeKey;
-
+    @TableField("next_node_route")
+    private String nextNodeRoute;
 }

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

+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 验收整改单
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_acceptance_rectification_order")
+public class RectificationOrder extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改单号
+     */
+    @TableField("rectification_order_code")
+    private String rectificationOrderCode;
+
+    /**
+     * 施工单ID
+     */
+    @TableField("work_order_id")
+    private Long workOrderId;
+
+    /**
+     * 施工电站ID
+     */
+    @TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户ID
+     */
+    @TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 电站ID
+     */
+    @TableField("power_station_id")
+    private String powerStationId;
+
+    /**
+     * 问题描述
+     */
+    @TableField("problem_description")
+    private String problemDescription;
+
+    /**
+     * 整改结果
+     */
+    @TableField("rectification_result")
+    private String rectificationResult;
+
+    /**
+     * 整改描述
+     */
+    @TableField("rectification_description")
+    private String rectificationDescription;
+
+    /**
+     * 完成日期
+     */
+    @TableField("complete_date")
+    private String completeDate;
+
+    /**
+     * 负责人ID
+     */
+    @TableField("responsible_user_id")
+    private String responsibleUserId;
+
+    /**
+     * 负责人姓名
+     */
+    @TableField("responsible_user_name")
+    private String responsibleUserName;
+
+    /**
+     * 负责人电话
+     */
+    @TableField("responsible_user_phone")
+    private String responsibleUserPhone;
+
+    /**
+     * 整改照片
+     */
+    @TableField("rectification_photo")
+    private String rectificationPhoto;
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
- * 验收检查项 Mapper 接口
- *
- * @author system_generator
- * @date 2024-01-16
+ * 验收检查项Mapper接口
  */
 public interface AcceptanceCheckItemMapper extends BaseMapper<AcceptanceCheckItem> {
-
+    /**
+     * 分页查询整改单列表数据
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return 分页结果
+     */
+    IPage<AcceptanceDto> page(
+            @Param("page") IPage<AcceptanceDto> page,
+            @Param("param") Map<String, Object> param
+    );
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+import org.apache.ibatis.annotations.Param;
+
+public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
+    /**
+     * 分页查询验收列表数据
+     *
+     * @param page          分页对象
+     * @param acceptanceDto 查询参数
+     * @return 分页结果
+     */
+    IPage<AcceptanceDto> page(
+            @Param("page") IPage<AcceptanceDto> page,
+            @Param("sourceType") Integer sourceType,
+            @Param("param") AcceptanceDto acceptanceDto
+    );
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 验收整改单 Mapper 接口
@@ -10,5 +14,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2024-01-16
  */
 public interface AcceptanceRectificationOrderMapper extends BaseMapper<AcceptanceRectificationOrder> {
-
+    /**
+     * 分页查询整改单列表数据
+     *
+     * @param page             分页对象
+     * @param acceptanceSeqNbr 验收单编号
+     * @return 分页结果
+     */
+    Page<AcceptanceRectificationOrderDto> page(
+            @Param("page") IPage<AcceptanceRectificationOrderDto> page,
+            @Param("acceptanceSeqNbr") Long acceptanceSeqNbr
+    );
 }

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.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 
-/**
- *  Mapper 接口
- *
- * @author system_generator
- * @date 2024-01-16
- */
 public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptance> {
-
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAcceptanceCheckItemService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
-
 /**
- * 验收检查项接口类
- *
- * @author system_generator
- * @date 2024-01-16
+ * 验收检查项Service
  */
 public interface IAcceptanceCheckItemService {
-
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAcceptanceService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+
+import java.util.Map;
+
+public interface IAcceptanceService {
+    /**
+     * 分页查询验收列表数据
+     *
+     * @param page          分页对象
+     * @param acceptanceDto 查询参数
+     * @return 分页结果
+     */
+    IPage<AcceptanceDto> page(IPage<AcceptanceDto> page, Integer sourceType, AcceptanceDto acceptanceDto);
+
+    /**
+     * 根据sequenceNbr查询验收详情（线下验收）
+     *
+     * @param sequenceNbr sequenceNbr
+     * @return Map
+     */
+    Map<String, Object> offlineAcceptanceDetails(Long sequenceNbr);
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IBasicGridAcceptanceService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
-
-/**
- * 接口类
- *
- * @author system_generator
- * @date 2024-01-16
- */
 public interface IBasicGridAcceptanceService {
-
 }

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

-<?xml version="1.0" encoding="UTF-8"?>
-<!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.AcceptanceRectificationOrderMapper">
-
-</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.AcceptanceMapper">
+
+
+    <select id="page" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto">
+        SELECT
+            bga.sequence_nbr AS sequenceNbr,
+            ph.peasant_household_no AS powerStationCode,
+            ph.developer_name as serviceAgent,
+            ph.owners_name AS ownersName,
+            ph.project_address AS projectAddress,
+            bga.acceptance_rec_date AS acceptanceRecDate,
+            bga.acceptance_status AS acceptanceStatus,
+            ifnull((
+                SELECT count(1) FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id
+            ), 0) AS rectificationOrderCount,
+            ifnull((
+               SELECT aro.rectification_status FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id ORDER BY rec_date DESC LIMIT 1
+            ), 0) AS rectificationStatus
+        FROM
+            hygf_basic_grid_acceptance bga
+                LEFT JOIN hygf_peasant_household ph ON ph.sequence_nbr = bga.peasant_household_id
+        WHERE
+            bga.is_delete = 0
+            AND bga.acceptance_status IS NOT NULL AND bga.acceptance_status != ''
+    </select>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.AcceptanceRectificationOrderMapper">
+    <select id="page" resultType="java.util.Map">
+        SELECT
+            aro.sequence_nbr AS sequenceNbr,
+            ph.peasant_household_no as powerStationCode,
+            ph.owners_name AS ownersName,
+            ph.project_address AS powerStationAddress,
+            IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, 1) AS rectificationStatus
+        FROM
+            hygf_acceptance_rectification_order aro
+                 LEFT JOIN hygf_peasant_household ph ON ph.sequence_nbr = aro.peasant_household_id
+        <where>
+            aro.is_delete = 0
+            <if test="acceptanceSeqNbr != null and acceptanceSeqNbr != ''">
+                AND aro.peasant_household_id = #{acceptanceSeqNbr}
+            </if>
+        </where>
+        ORDER BY
+            aro.rectification_status DESC,
+            aro.rec_date DESC
+    </select>
+</mapper>

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

@@ -2,4 +2,5 @@
 <!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">
 
+
 </mapper>

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@RestController
+@Api(tags = "验收管理")
+@RequestMapping(value = "/acceptance")
+public class AcceptanceController {
+    @Autowired
+    private IAcceptanceService acceptanceService;
+
+    @GetMapping("/page")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
+    public ResponseModel<IPage<AcceptanceDto>> page(
+            @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+            @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
+            @RequestParam(value = "sourceType", required = false) Integer sourceType,
+            AcceptanceDto acceptanceDto
+    ) {
+        IPage<AcceptanceDto> page = new Page<>(current, size);
+        page = acceptanceService.page(page, sourceType, acceptanceDto);
+        return ResponseHelper.buildResponse(page);
+    }
+
+    @GetMapping("/offline-acceptance-details/{sequenceNbr}")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
+    public ResponseModel<Map<String, Object>> offlineAcceptanceDetails(@PathVariable("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(acceptanceService.offlineAcceptanceDetails(sequenceNbr));
+    }
+}

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

@@ -94,12 +94,13 @@ public class AcceptanceRectificationOrderController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "验收整改单分页查询",  notes = "验收整改单分页查询")
-	public ResponseModel<Page<AcceptanceRectificationOrderDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<AcceptanceRectificationOrderDto> page = new Page<AcceptanceRectificationOrderDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderPage(page));
+	public ResponseModel<Page<AcceptanceRectificationOrderDto>> queryForPage(
+			@RequestParam(value = "acceptanceSeqNbr") Long acceptanceSeqNbr,
+			@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+			@RequestParam(value = "size", required = false, defaultValue = "20") Integer size
+	) {
+	    Page<AcceptanceRectificationOrderDto> page = new Page<>(current, size);
+	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderPage(page, acceptanceSeqNbr));
 	}
 
 	/**

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

@@ -5,6 +5,8 @@ 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.Collections;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BasicGridAcceptanceServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -18,7 +20,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 /**
- * 
+ *
  *
  * @author system_generator
  * @date 2024-01-16
@@ -99,7 +101,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	    Page<BasicGridAcceptanceDto> page = new Page<BasicGridAcceptanceDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.queryForBasicGridAcceptancePage(page));
+	    return ResponseHelper.buildResponse(page);
 	}
 
 	/**
@@ -111,6 +113,6 @@ public class BasicGridAcceptanceController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<BasicGridAcceptanceDto>> selectForList() {
-	    return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.queryForBasicGridAcceptanceList());
+	    return ResponseHelper.buildResponse(Collections.emptyList());
 	}
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrderMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrderService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,11 +22,16 @@ import java.util.List;
  */
 @Service
 public class AcceptanceRectificationOrderServiceImpl extends BaseService<AcceptanceRectificationOrderDto,AcceptanceRectificationOrder,AcceptanceRectificationOrderMapper> implements IAcceptanceRectificationOrderService {
+    @Autowired
+    private AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
+
     /**
      * 分页查询
      */
-    public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr)   {
+        Page<AcceptanceRectificationOrderDto> resultPage = acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
+        resultPage.getRecords().forEach(v -> v.setRectificationStatusDesc("0".equals(v.getRectificationStatus()) ? "待整改" : "整改完成"));
+        return resultPage;
     }
 
     /**

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckItemDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AcceptanceServiceImpl implements IAcceptanceService {
+
+    @Autowired
+    private AcceptanceMapper acceptanceMapper;
+    @Autowired
+    private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+    @Autowired
+    private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
+
+    /**
+     * 分页查询验收列表数据
+     *
+     * @param page          分页对象
+     * @param acceptanceDto 查询参数
+     * @return 分页结果
+     */
+    @Override
+    public IPage<AcceptanceDto> page(IPage<AcceptanceDto> page, Integer sourceType, AcceptanceDto acceptanceDto) {
+        IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, sourceType, acceptanceDto);
+        resultPage.getRecords().forEach(v -> {
+            AcceptanceStatusEnum statusEnum = AcceptanceStatusEnum.getNodeByCode(Integer.parseInt(v.getAcceptanceStatus()));
+            v.setAcceptanceStatusDesc(statusEnum.getName());
+            v.setRectificationStatusDesc("0".equals(v.getAcceptanceStatus()) ? "待整改" : "整改完成");
+        });
+        return resultPage;
+    }
+
+    /**
+     * 根据sequenceNbr查询验收详情（线下验收）
+     *
+     * @param sequenceNbr sequenceNbr
+     * @return Map
+     */
+    @Override
+    public Map<String, Object> offlineAcceptanceDetails(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()
+                        .eq(AcceptanceCheckItem::getWorkOrderPowerStationId, basicGridAcceptance.getWorkOrderPowerStationId())
+        );
+        AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
+        BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
+        result.put("checkItem", acceptanceCheckItemDto);
+
+        return result;
+    }
+}

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.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.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
-import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-/**
- * 服务实现类
- *
- * @author system_generator
- * @date 2024-01-16
- */
+@Slf4j
 @Service
-public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAcceptanceDto,BasicGridAcceptance,BasicGridAcceptanceMapper> implements IBasicGridAcceptanceService {
-    /**
-     * 分页查询
-     */
-    public Page<BasicGridAcceptanceDto> queryForBasicGridAcceptancePage(Page<BasicGridAcceptanceDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<BasicGridAcceptanceDto> queryForBasicGridAcceptanceList()   {
-        return this.queryForList("" , false);
-    }
-}
\ No newline at end of file
+public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper> implements IBasicGridAcceptanceService {
+}