Skip to content

A
amos-boot-biz
Commit f8597360 authored by 李秀明's avatar 李秀明
Browse files
Options

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

parent 1a61f459
Hide whitespace changes
Inline Side-by-side
Showing with 971 additions and 394 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java 0 → 100644
View file @ f8597360
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/AcceptanceCheckItemDto.java
View file @ f8597360
package com.yeejoin.amos.boot.module.hygf.api.dto;
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 java.util.Date;
/**
* 验收检查项
*
* @author system_generator
* @date 2024-01-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="AcceptanceCheckItemDto", description="验收检查项")
public class AcceptanceCheckItemDto extends BaseDto {
public class AcceptanceCheckItemDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "施工单id")
/**
* 施工单ID
*/
private Long workOrderId;
@ApiModelProperty(value = "施工电站id")
/**
* 施工电站ID
*/
private Long workOrderPowerStationId;
@ApiModelProperty(value = "农户id")
/**
* 农户ID
*/
private Long peasantHouseholdId;
@ApiModelProperty(value = "型号")
// ------------------------------------------------组件与组串------------------------------------------------
/**
* 型号
*/
private String assemblyModel;
@ApiModelProperty(value = "型号（备注）")
/**
* 型号（备注）
*/
private String assemblyModelRemark;
@ApiModelProperty(value = "功率")
/**
* 功率
*/
private String assemblyPower;
@ApiModelProperty(value = "功率（备注）")
/**
* 功率（备注）
*/
private String assemblyPowerRemark;
@ApiModelProperty(value = "数量-组件")
/**
* 数量-组件
*/
private String assemblyQuantity;
@ApiModelProperty(value = "数量-组件（备注）")
/**
* 数量-组件（备注）
*/
private String assemblyQuantityRemark;
@ApiModelProperty(value = "数量-组串")
/**
* 数量-组串
*/
private String stringQuantity;
@ApiModelProperty(value = "数量-组串（备注）")
/**
* 数量-组串（备注）
*/
private String stringQuantityRemark;
@ApiModelProperty(value = "平整洁净程度")
/**
* 平整洁净程度
*/
private String cleanliness;
@ApiModelProperty(value = "平整洁净程度（备注）")
/**
* 平整洁净程度（备注）
*/
private String cleanlinessRemark;
@ApiModelProperty(value = "完整无破损")
/**
* 完整无破损
*/
private String intact;
@ApiModelProperty(value = "完整无破损（备注）")
/**
* 完整无破损（备注）
*/
private String intactRemark;
@ApiModelProperty(value = "无阴影遮挡")
/**
* 无阴影遮挡
*/
private String shadow;
@ApiModelProperty(value = "无阴影遮挡（备注）")
/**
* 无阴影遮挡（备注）
*/
private String shadowRemark;
@ApiModelProperty(value = "组件高差")
/**
* 组件高差
*/
private String assemblyHeightDifference;
@ApiModelProperty(value = "组件高差（备注）")
/**
* 组件高差（备注）
*/
private String assemblyHeightDifferenceRemark;
@ApiModelProperty(value = "组件间间距")
/**
* 组件间间距
*/
private String assemblySpacing;
@ApiModelProperty(value = "组件间间距（备注）")
/**
* 组件间间距（备注）
*/
private String assemblySpacingRemark;
@ApiModelProperty(value = "同组组串倾角/方位角偏差")
/**
* 同组组串倾角/方位角偏差
*/
private String stringAngleDifference;
@ApiModelProperty(value = "同组组串倾角/方位角偏差（备注）")
/**
* 同组组串倾角/方位角偏差（备注）
*/
private String stringAngleDifferenceRemark;
@ApiModelProperty(value = "组件固定螺栓力矩值")
/**
* 组件固定螺栓力矩值
*/
private String assemblyBoltForceMoment;
@ApiModelProperty(value = "组件固定螺栓力矩值（备注）")
/**
* 组件固定螺栓力矩值（备注）
*/
private String assemblyBoltForceMomentRemark;
@ApiModelProperty(value = "组件序列号检查1")
/**
* 组件序列号检查1
*/
private String assemblySerialNumberCheckOne;
@ApiModelProperty(value = "组件序列号检查2")
/**
* 组件序列号检查2
*/
private String assemblySerialNumberCheckTwo;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String assemblyOther;
@ApiModelProperty(value = "型号")
// ------------------------------------------------逆变器------------------------------------------------
/**
* 型号
*/
private String inverterModel;
@ApiModelProperty(value = "型号（备注）")
/**
* 型号（备注）
*/
private String inverterModelRemark;
@ApiModelProperty(value = "完整无破损、受潮")
/**
* 完整无破损、受潮
*/
private String inverterIntact;
@ApiModelProperty(value = "完整无破损、受潮（备注）")
/**
* 完整无破损、受潮（备注）
*/
private String inverterIntactRemark;
@ApiModelProperty(value = "安装高度")
/**
* 安装高度
*/
private String inverterInstallationHeight;
@ApiModelProperty(value = "安装高度（备注）")
/**
* 安装高度（备注）
*/
private String inverterInstallationHeightRemark;
@ApiModelProperty(value = "交直流电缆绝缘良好")
/**
* 交直流电缆绝缘良好
*/
private String inverterCableInsulation;
@ApiModelProperty(value = "交直流电缆绝缘良好（备注）")
/**
* 交直流电缆绝缘良好（备注）
*/
private String inverterCableInsulationRemark;
@ApiModelProperty(value = "电缆相序、极性正确")
/**
* 电缆相序、极性正确
*/
private String inverterCableSequence;
@ApiModelProperty(value = "电缆相序、极性正确（备注）")
/**
* 电缆相序、极性正确（备注）
*/
private String inverterCableSequenceRemark;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String inverterOther;
@ApiModelProperty(value = "规格")
// ------------------------------------------------支架基础------------------------------------------------
/**
* 规格
*/
private String zipperSpecification;
@ApiModelProperty(value = "规格（备注）")
/**
* 规格（备注）
*/
private String zipperSpecificationRemark;
@ApiModelProperty(value = "数量（与设计图对比）")
/**
* 数量（与设计图对比）
*/
private String zipperQuantity;
@ApiModelProperty(value = "数量（与设计图对比）（备注）")
/**
* 数量（与设计图对比）（备注）
*/
private String zipperQuantityRemark;
@ApiModelProperty(value = "支架焊接质量")
/**
* 支架焊接质量
*/
private String bracketWeldingQuality;
@ApiModelProperty(value = "支架焊接质量（备注）")
/**
* 支架焊接质量（备注）
*/
private String bracketWeldingQualityRemark;
@ApiModelProperty(value = "不影响原建筑防水")
/**
* 不影响原建筑防水
*/
private String waterproof;
@ApiModelProperty(value = "不影响原建筑水防（备注）")
/**
* 不影响原建筑水防（备注）
*/
private String waterproofRemark;
@ApiModelProperty(value = "支架之间螺丝紧固程度")
/**
* 支架之间螺丝紧固程度
*/
private String bracketScrewsTightness;
@ApiModelProperty(value = "支架之间螺丝紧固程度（备注）")
/**
* 支架之间螺丝紧固程度（备注）
*/
private String bracketScrewsTightnessRemark;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String bracketOther;
@ApiModelProperty(value = "型号")
// ------------------------------------------------并网箱------------------------------------------------
/**
* 型号
*/
private String gridBoxModel;
@ApiModelProperty(value = "型号（备注）")
/**
* 型号（备注）
*/
private String gridBoxModelRemark;
@ApiModelProperty(value = "外观完整无破损、变形")
/**
* 外观完整无破损、变形
*/
private String gridBoxIntact;
@ApiModelProperty(value = "外观完整无破损、变形（备注）")
/**
* 外观完整无破损、变形（备注）
*/
private String gridBoxIntactRemark;
@ApiModelProperty(value = "警示标识是否齐全")
/**
* 警示标识是否齐全
*/
private String gridBoxWarningMark;
@ApiModelProperty(value = "警示标识是否齐全（备注）")
/**
* 警示标识是否齐全（备注）
*/
private String gridBoxWarningMarkRemark;
@ApiModelProperty(value = "箱内走线美观清晰")
/**
* 箱内走线美观清晰
*/
private String gridBoxLineNeat;
@ApiModelProperty(value = "箱内走线美观清晰（备注）")
/**
* 箱内走线美观清晰（备注）
*/
private String gridBoxLineNeatRemark;
@ApiModelProperty(value = "元器件紧固螺栓完好")
/**
* 元器件紧固螺栓完好
*/
private String gridBoxBoltIntact;
@ApiModelProperty(value = "元件件紧扣螺钉完好（备注）")
/**
* 元器件紧固螺栓完好（备注）
*/
private String gridBoxBoltIntactRemark;
@ApiModelProperty(value = "防火封堵齐全")
/**
* 防火封堵齐全
*/
private String fireProtectionComplete;
@ApiModelProperty(value = "防火封堵齐全（备注）")
/**
* 防火封堵齐全（备注）
*/
private String fireProtectionCompleteRemark;
@ApiModelProperty(value = "表箱接地线安装")
/**
* 表箱接地线安装
*/
private String meterBoxGroundWire;
@ApiModelProperty(value = "表箱接地线安装（备注）")
/**
* 表箱接地线安装（备注）
*/
private String meterBoxGroundWireRemark;
@ApiModelProperty(value = "箱内无杂物")
/**
* 箱内无杂物
*/
private String boxClean;
@ApiModelProperty(value = "箱内无杂物（备注）")
/**
* 箱内无杂物（备注）
*/
private String boxCleanRemark;
@ApiModelProperty(value = "安装高度")
/**
* 安装高度
*/
private String boxInstallationHeight;
@ApiModelProperty(value = "安装高度（备注）")
/**
* 安装高度（备注）
*/
private String boxInstallationHeightRemark;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String boxOther;
@ApiModelProperty(value = "交、直、地规格")
// ------------------------------------------------电缆------------------------------------------------
/**
* 交、直、地规格
*/
private String cableSpecification;
@ApiModelProperty(value = "交、直、地规格（备注）")
/**
* 交、直、地规格（备注）
*/
private String cableSpecificationRemark;
@ApiModelProperty(value = "交直流无同管敷设")
/**
* 交直流无同管敷设
*/
private String cableLaying;
@ApiModelProperty(value = "交直流无同管敷设（备注）")
/**
* 交直流无同管敷设（备注）
*/
private String cableLayingRemark;
@ApiModelProperty(value = "MC4安装牢固")
/**
* MC4安装牢固
*/
private String cableMc4Intact;
@ApiModelProperty(value = "MC4安装牢固（备注）")
/**
* MC4安装牢固（备注）
*/
private String cableMc4IntactRemark;
@ApiModelProperty(value = "电缆绝缘层无破损")
/**
* 电缆绝缘层无破损
*/
private String cableInsulationIntact;
@ApiModelProperty(value = "电缆绝缘层无破损（备注）")
/**
* 电缆绝缘层无破损（备注）
*/
private String cableInsulationIntactRemark;
@ApiModelProperty(value = "电缆采用穿管或桥架保护")
/**
* 电缆采用穿管或桥架保护
*/
private String cableProtection;
@ApiModelProperty(value = "电缆采用穿管或桥架保护（备注）")
/**
* 电缆采用穿管或桥架保护（备注）
*/
private String cableProtectionRemark;
@ApiModelProperty(value = "电缆进出箱柜端口有防火泥封堵")
/**
* 电缆进出箱柜端口有防火泥封堵
*/
private String cableFirewall;
@ApiModelProperty(value = "电缆进出箱柜端口有防火泥封堵（备注）")
/**
* 电缆进出箱柜端口有防火泥封堵（备注）
*/
private String cableFirewallRemark;
@ApiModelProperty(value = "走线横平竖直")
/**
* 走线横平竖直
*/
private String cableNeat;
@ApiModelProperty(value = "走线横平竖直（备注）")
/**
* 走线横平竖直（备注）
*/
private String cableNeatRemark;
@ApiModelProperty(value = "管卡间距")
/**
* 管卡间距
*/
private String cableSpacing;
@ApiModelProperty(value = "管卡间距（备注）")
/**
* 管卡间距（备注）
*/
private String cableSpacingRemark;
@ApiModelProperty(value = "直角转弯间距")
/**
* 直角转弯间距
*/
private String cableRightAngleSpacing;
@ApiModelProperty(value = "直角转弯间距（备注）")
/**
* 直角转弯间距（备注）
*/
private String cableRightAngleSpacingRemark;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String cableOther;
@ApiModelProperty(value = "组件之间连接的接地线径")
// ------------------------------------------------接地系统安装------------------------------------------------
/**
* 组件之间连接的接地线径
*/
private String groundWireDiameter;
@ApiModelProperty(value = "组件之间连接的接地线径（备注）")
/**
* 组件之间连接的接地线径（备注）
*/
private String groundWireDiameterRemark;
@ApiModelProperty(value = "逆变器内部表箱接地接电线需要有鼻子")
/**
* 逆变器内部表箱接地接电线需要有鼻子
*/
private String groundWireNose;
@ApiModelProperty(value = "支架和电表箱共用接地极接地电阻小于4欧姆")
/**
* 支架和电表箱共用接地极接地电阻小于4欧姆
*/
private String groundResistanceLessThan4;
@ApiModelProperty(value = "支架接地需小于10欧姆")
/**
* 支架接地需小于10欧姆
*/
private String groundResistanceLessThan10;
@ApiModelProperty(value = "电表箱单独接地符合国家标准，小于4欧姆")
/**
* 电表箱单独接地符合国家标准，小于4欧姆
*/
private String groundResistanceStandardCompliant;
@ApiModelProperty(value = "其他")
/**
* 其他
*/
private String groundOther;
@ApiModelProperty(value = "逆变器整体图")
// ------------------------------------------------电站检查项拍照片保存------------------------------------------------
/**
* 逆变器整体图
*/
private String overallImage;
@ApiModelProperty(value = "电表箱整体图")
/**
* 电表箱整体图
*/
private String meterBoxOverallImage;
@ApiModelProperty(value = "组件方阵图")
/**
* 组件方阵图
*/
private String assemblyArrayImage;
@ApiModelProperty(value = "组件方位角测试照片")
/**
* 组件方位角测试照片
*/
private String assemblyAzimuthImage;
@ApiModelProperty(value = "组件倾斜角测试照片")
/**
* 组件倾斜角测试照片
*/
private String assemblyDipAngleImage;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java 0 → 100644
View file @ f8597360
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
View file @ f8597360
......@@ -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
View file @ f8597360
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/AcceptanceCheckItem.java
View file @ f8597360
......@@ -6,13 +6,9 @@ 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)
......@@ -23,603 +19,602 @@ public class AcceptanceCheckItem 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("assembly_model")
@TableField("assembly_model")
private String assemblyModel;
/**
* 型号（备注）
*/
@TableField("assembly_model_remark")
@TableField("assembly_model_remark")
private String assemblyModelRemark;
/**
* 功率
*/
@TableField("assembly_power")
@TableField("assembly_power")
private String assemblyPower;
/**
* 功率（备注）
*/
@TableField("assembly_power_remark")
@TableField("assembly_power_remark")
private String assemblyPowerRemark;
/**
* 数量-组件
*/
@TableField("assembly_quantity")
@TableField("assembly_quantity")
private String assemblyQuantity;
/**
* 数量-组件（备注）
*/
@TableField("assembly_quantity_remark")
@TableField("assembly_quantity_remark")
private String assemblyQuantityRemark;
/**
* 数量-组串
*/
@TableField("string_quantity")
@TableField("string_quantity")
private String stringQuantity;
/**
* 数量-组串（备注）
*/
@TableField("string_quantity_remark")
@TableField("string_quantity_remark")
private String stringQuantityRemark;
/**
* 平整洁净程度
*/
@TableField("cleanliness")
@TableField("cleanliness")
private String cleanliness;
/**
* 平整洁净程度（备注）
*/
@TableField("cleanliness_remark")
@TableField("cleanliness_remark")
private String cleanlinessRemark;
/**
* 完整无破损
*/
@TableField("intact")
@TableField("intact")
private String intact;
/**
* 完整无破损（备注）
*/
@TableField("intact_remark")
@TableField("intact_remark")
private String intactRemark;
/**
* 无阴影遮挡
*/
@TableField("shadow")
@TableField("shadow")
private String shadow;
/**
* 无阴影遮挡（备注）
*/
@TableField("shadow_remark")
@TableField("shadow_remark")
private String shadowRemark;
/**
* 组件高差
*/
@TableField("assembly_height_difference")
@TableField("assembly_height_difference")
private String assemblyHeightDifference;
/**
* 组件高差（备注）
*/
@TableField("assembly_height_difference_remark")
@TableField("assembly_height_difference_remark")
private String assemblyHeightDifferenceRemark;
/**
* 组件间间距
*/
@TableField("assembly_spacing")
@TableField("assembly_spacing")
private String assemblySpacing;
/**
* 组件间间距（备注）
*/
@TableField("assembly_spacing_remark")
@TableField("assembly_spacing_remark")
private String assemblySpacingRemark;
/**
* 同组组串倾角/方位角偏差
*/
@TableField("string_angle_difference")
@TableField("string_angle_difference")
private String stringAngleDifference;
/**
* 同组组串倾角/方位角偏差（备注）
*/
@TableField("string_angle_difference_remark")
@TableField("string_angle_difference_remark")
private String stringAngleDifferenceRemark;
/**
* 组件固定螺栓力矩值
*/
@TableField("assembly_bolt_force_moment")
@TableField("assembly_bolt_force_moment")
private String assemblyBoltForceMoment;
/**
* 组件固定螺栓力矩值（备注）
*/
@TableField("assembly_bolt_force_moment_remark")
@TableField("assembly_bolt_force_moment_remark")
private String assemblyBoltForceMomentRemark;
/**
* 组件序列号检查1
*/
@TableField("assembly_serial_number_check_one")
@TableField("assembly_serial_number_check_one")
private String assemblySerialNumberCheckOne;
/**
* 组件序列号检查2
*/
@TableField("assembly_serial_number_check_two")
@TableField("assembly_serial_number_check_two")
private String assemblySerialNumberCheckTwo;
/**
* 其他
*/
@TableField("assembly_other")
@TableField("assembly_other")
private String assemblyOther;
// ------------------------------------------------逆变器------------------------------------------------
/**
* 型号
*/
@TableField("inverter_model")
@TableField("inverter_model")
private String inverterModel;
/**
* 型号（备注）
*/
@TableField("inverter_model_remark")
@TableField("inverter_model_remark")
private String inverterModelRemark;
/**
* 完整无破损、受潮
*/
@TableField("inverter_intact")
@TableField("inverter_intact")
private String inverterIntact;
/**
* 完整无破损、受潮（备注）
*/
@TableField("inverter_intact_remark")
@TableField("inverter_intact_remark")
private String inverterIntactRemark;
/**
* 安装高度
*/
@TableField("inverter_installation_height")
@TableField("inverter_installation_height")
private String inverterInstallationHeight;
/**
* 安装高度（备注）
*/
@TableField("inverter_installation_height_remark")
@TableField("inverter_installation_height_remark")
private String inverterInstallationHeightRemark;
/**
* 交直流电缆绝缘良好
*/
@TableField("inverter_cable_insulation")
@TableField("inverter_cable_insulation")
private String inverterCableInsulation;
/**
* 交直流电缆绝缘良好（备注）
*/
@TableField("inverter_cable_insulation_remark")
@TableField("inverter_cable_insulation_remark")
private String inverterCableInsulationRemark;
/**
* 电缆相序、极性正确
*/
@TableField("inverter_cable_sequence")
@TableField("inverter_cable_sequence")
private String inverterCableSequence;
/**
* 电缆相序、极性正确（备注）
*/
@TableField("inverter_cable_sequence_remark")
@TableField("inverter_cable_sequence_remark")
private String inverterCableSequenceRemark;
/**
* 其他
*/
@TableField("inverter_other")
@TableField("inverter_other")
private String inverterOther;
// ------------------------------------------------支架基础------------------------------------------------
/**
* 规格
*/
@TableField("zipper_specification")
@TableField("zipper_specification")
private String zipperSpecification;
/**
* 规格（备注）
*/
@TableField("zipper_specification_remark")
@TableField("zipper_specification_remark")
private String zipperSpecificationRemark;
/**
* 数量（与设计图对比）
*/
@TableField("zipper_quantity")
@TableField("zipper_quantity")
private String zipperQuantity;
/**
* 数量（与设计图对比）（备注）
*/
@TableField("zipper_quantity_remark")
@TableField("zipper_quantity_remark")
private String zipperQuantityRemark;
/**
* 支架焊接质量
*/
@TableField("bracket_welding_quality")
@TableField("bracket_welding_quality")
private String bracketWeldingQuality;
/**
* 支架焊接质量（备注）
*/
@TableField("bracket_welding_quality_remark")
@TableField("bracket_welding_quality_remark")
private String bracketWeldingQualityRemark;
/**
* 不影响原建筑防水
*/
@TableField("waterproof")
@TableField("waterproof")
private String waterproof;
/**
* 不影响原建筑水防（备注）
*/
@TableField("waterproof_remark")
@TableField("waterproof_remark")
private String waterproofRemark;
/**
* 支架之间螺丝紧固程度
*/
@TableField("bracket_screws_tightness")
@TableField("bracket_screws_tightness")
private String bracketScrewsTightness;
/**
* 支架之间螺丝紧固程度（备注）
*/
@TableField("bracket_screws_tightness_remark")
@TableField("bracket_screws_tightness_remark")
private String bracketScrewsTightnessRemark;
/**
* 其他
*/
@TableField("bracket_other")
@TableField("bracket_other")
private String bracketOther;
// ------------------------------------------------并网箱------------------------------------------------
/**
* 型号
*/
@TableField("grid_box_model")
@TableField("grid_box_model")
private String gridBoxModel;
/**
* 型号（备注）
*/
@TableField("grid_box_model_remark")
@TableField("grid_box_model_remark")
private String gridBoxModelRemark;
/**
* 外观完整无破损、变形
*/
@TableField("grid_box_intact")
@TableField("grid_box_intact")
private String gridBoxIntact;
/**
* 外观完整无破损、变形（备注）
*/
@TableField("grid_box_intact_remark")
@TableField("grid_box_intact_remark")
private String gridBoxIntactRemark;
/**
* 警示标识是否齐全
*/
@TableField("grid_box_warning_mark")
@TableField("grid_box_warning_mark")
private String gridBoxWarningMark;
/**
* 警示标识是否齐全（备注）
*/
@TableField("grid_box_warning_mark_remark")
@TableField("grid_box_warning_mark_remark")
private String gridBoxWarningMarkRemark;
/**
* 箱内走线美观清晰
*/
@TableField("grid_box_line_neat")
@TableField("grid_box_line_neat")
private String gridBoxLineNeat;
/**
* 箱内走线美观清晰（备注）
*/
@TableField("grid_box_line_neat_remark")
@TableField("grid_box_line_neat_remark")
private String gridBoxLineNeatRemark;
/**
* 元器件紧固螺栓完好
*/
@TableField("grid_box_bolt_intact")
@TableField("grid_box_bolt_intact")
private String gridBoxBoltIntact;
/**
* 元件件紧扣螺钉完好（备注）
* 元器件紧固螺栓完好（备注）
*/
@TableField("grid_box_bolt_intact_remark")
@TableField("grid_box_bolt_intact_remark")
private String gridBoxBoltIntactRemark;
/**
* 防火封堵齐全
*/
@TableField("fire_protection_complete")
@TableField("fire_protection_complete")
private String fireProtectionComplete;
/**
* 防火封堵齐全（备注）
*/
@TableField("fire_protection_complete_remark")
@TableField("fire_protection_complete_remark")
private String fireProtectionCompleteRemark;
/**
* 表箱接地线安装
*/
@TableField("meter_box_ground_wire")
@TableField("meter_box_ground_wire")
private String meterBoxGroundWire;
/**
* 表箱接地线安装（备注）
*/
@TableField("meter_box_ground_wire_remark")
@TableField("meter_box_ground_wire_remark")
private String meterBoxGroundWireRemark;
/**
* 箱内无杂物
*/
@TableField("box_clean")
@TableField("box_clean")
private String boxClean;
/**
* 箱内无杂物（备注）
*/
@TableField("box_clean_remark")
@TableField("box_clean_remark")
private String boxCleanRemark;
/**
* 安装高度
*/
@TableField("box_installation_height")
@TableField("box_installation_height")
private String boxInstallationHeight;
/**
* 安装高度（备注）
*/
@TableField("box_installation_height_remark")
@TableField("box_installation_height_remark")
private String boxInstallationHeightRemark;
/**
* 其他
*/
@TableField("box_other")
@TableField("box_other")
private String boxOther;
// ------------------------------------------------电缆------------------------------------------------
/**
* 交、直、地规格
*/
@TableField("cable_specification")
@TableField("cable_specification")
private String cableSpecification;
/**
* 交、直、地规格（备注）
*/
@TableField("cable_specification_remark")
@TableField("cable_specification_remark")
private String cableSpecificationRemark;
/**
* 交直流无同管敷设
*/
@TableField("cable_laying")
@TableField("cable_laying")
private String cableLaying;
/**
* 交直流无同管敷设（备注）
*/
@TableField("cable_laying_remark")
@TableField("cable_laying_remark")
private String cableLayingRemark;
/**
* MC4安装牢固
*/
@TableField("cable_mc4_intact")
@TableField("cable_mc4_intact")
private String cableMc4Intact;
/**
* MC4安装牢固（备注）
*/
@TableField("cable_mc4_intact_remark")
@TableField("cable_mc4_intact_remark")
private String cableMc4IntactRemark;
/**
* 电缆绝缘层无破损
*/
@TableField("cable_insulation_intact")
@TableField("cable_insulation_intact")
private String cableInsulationIntact;
/**
* 电缆绝缘层无破损（备注）
*/
@TableField("cable_insulation_intact_remark")
@TableField("cable_insulation_intact_remark")
private String cableInsulationIntactRemark;
/**
* 电缆采用穿管或桥架保护
*/
@TableField("cable_protection")
@TableField("cable_protection")
private String cableProtection;
/**
* 电缆采用穿管或桥架保护（备注）
*/
@TableField("cable_protection_remark")
@TableField("cable_protection_remark")
private String cableProtectionRemark;
/**
* 电缆进出箱柜端口有防火泥封堵
*/
@TableField("cable_firewall")
@TableField("cable_firewall")
private String cableFirewall;
/**
* 电缆进出箱柜端口有防火泥封堵（备注）
*/
@TableField("cable_firewall_remark")
@TableField("cable_firewall_remark")
private String cableFirewallRemark;
/**
* 走线横平竖直
*/
@TableField("cable_neat")
@TableField("cable_neat")
private String cableNeat;
/**
* 走线横平竖直（备注）
*/
@TableField("cable_neat_remark")
@TableField("cable_neat_remark")
private String cableNeatRemark;
/**
* 管卡间距
*/
@TableField("cable_spacing")
@TableField("cable_spacing")
private String cableSpacing;
/**
* 管卡间距（备注）
*/
@TableField("cable_spacing_remark")
@TableField("cable_spacing_remark")
private String cableSpacingRemark;
/**
* 直角转弯间距
*/
@TableField("cable_right_angle_spacing")
@TableField("cable_right_angle_spacing")
private String cableRightAngleSpacing;
/**
* 直角转弯间距（备注）
*/
@TableField("cable_right_angle_spacing_remark")
@TableField("cable_right_angle_spacing_remark")
private String cableRightAngleSpacingRemark;
/**
* 其他
*/
@TableField("cable_other")
@TableField("cable_other")
private String cableOther;
// ------------------------------------------------接地系统安装------------------------------------------------
/**
* 组件之间连接的接地线径
*/
@TableField("ground_wire_diameter")
@TableField("ground_wire_diameter")
private String groundWireDiameter;
/**
* 组件之间连接的接地线径（备注）
*/
@TableField("ground_wire_diameter_remark")
@TableField("ground_wire_diameter_remark")
private String groundWireDiameterRemark;
/**
* 逆变器内部表箱接地接电线需要有鼻子
*/
@TableField("ground_wire_nose")
@TableField("ground_wire_nose")
private String groundWireNose;
/**
* 支架和电表箱共用接地极接地电阻小于4欧姆
*/
@TableField("ground_resistance_less_than_4")
@TableField("ground_resistance_less_than_4")
private String groundResistanceLessThan4;
/**
* 支架接地需小于10欧姆
*/
@TableField("ground_resistance_less_than_10")
@TableField("ground_resistance_less_than_10")
private String groundResistanceLessThan10;
/**
* 电表箱单独接地符合国家标准，小于4欧姆
*/
@TableField("ground_resistance_standard_compliant")
@TableField("ground_resistance_standard_compliant")
private String groundResistanceStandardCompliant;
/**
* 其他
*/
@TableField("ground_other")
@TableField("ground_other")
private String groundOther;
// ------------------------------------------------电站检查项拍照片保存------------------------------------------------
/**
* 逆变器整体图
*/
@TableField("overall_image")
@TableField("overall_image")
private String overallImage;
/**
* 电表箱整体图
*/
@TableField("meter_box_overall_image")
@TableField("meter_box_overall_image")
private String meterBoxOverallImage;
/**
* 组件方阵图
*/
@TableField("assembly_array_image")
@TableField("assembly_array_image")
private String assemblyArrayImage;
/**
* 组件方位角测试照片
*/
@TableField("assembly_azimuth_image")
@TableField("assembly_azimuth_image")
private String assemblyAzimuthImage;
/**
* 组件倾斜角测试照片
*/
@TableField("assembly_dip_angle_image")
@TableField("assembly_dip_angle_image")
private String assemblyDipAngleImage;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceRectificationOrder.java
View file @ f8597360
......@@ -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
View file @ f8597360
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 0 → 100644
View file @ f8597360
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
View file @ f8597360
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 0 → 100644
View file @ f8597360
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
View file @ f8597360
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
View file @ f8597360
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
View file @ f8597360
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 0 → 100644
View file @ f8597360
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
View file @ f8597360
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 deleted 100644 → 0
View file @ 1a61f459
<?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 0 → 100644
View file @ f8597360
<?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 0 → 100644
View file @ f8597360
<?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
View file @ f8597360
......@@ -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 0 → 100644
View file @ f8597360
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
View file @ f8597360
......@@ -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
View file @ f8597360
......@@ -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
View file @ f8597360
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 0 → 100644
View file @ f8597360
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
View file @ f8597360
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 {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment