Skip to content

A
amos-boot-biz
Commit 91696a8a authored by tangwei's avatar tangwei
Browse files
Options

派工施工管理

parent f02aed27
Hide whitespace changes
Inline Side-by-side
Showing with 1350 additions and 79 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/WorkOrderEnum.java
View file @ 91696a8a
...@@ -17,10 +17,15 @@ public enum WorkOrderEnum { ...@@ -17,10 +17,15 @@ public enum WorkOrderEnum {
施工中("施工中", "施工中"), 施工中("施工中", "施工中"),
待登记("待登记", "待登记"),
登记中("登记中", "登记中"), 登记中("登记中", "登记中"),
审核中("审核中", "审核中"), 审核中("审核中", "审核中"),
待审核("待审核", "待审核"),
未通过("未通过", "未通过"), 未通过("未通过", "未通过"),
已完工("已完工", "已完工"); 已完工("已完工", "已完工");
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java 0 → 100644
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import lombok.Data;
/**
* @description:
* @author: tw
* @createDate: 2024/1/12
*/
@Data
public class PowerStationEngineeringInfoAllDto {
// 基本信息
SurveyInformationDto surveyInformation;
Long workOrderPowerStationId;
// 资料归档
InformationDto information;
// 勘察信息详情
SurveyDetailsDto surveyDetails;
// 扩展信息
ExtendedInformationDto extendedInformation;
// 商务信息
CommercialDto commercial;
//设计信息
DesignInformationDto designInformation;
//订单跟踪
LoggerDto orderTracking;
//工程信息
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
PowerStationConstructionData powerStationConstructionData;
//并网信息
HygfOnGrid hygfOnGrid;
//派工单信息
WorkOrder workOrder;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoDto.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 施工电站工程信息 * 施工电站工程信息
...@@ -58,4 +62,52 @@ public class PowerStationEngineeringInfoDto extends BaseDto { ...@@ -58,4 +62,52 @@ public class PowerStationEngineeringInfoDto extends BaseDto {
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "完工登记日期")
private Date completionDate;
/**
* 施工组件信息
*/
private List<Object> constructionComponentInfo;
/**
* 施工逆变器信息
*/
private List<Object> constructionInverterInfo;
/**
* 施工采集器信息
*/
private List<Object> constructionCollectorBoxInfo;
/**
* 施工并网箱信息
*/
private List<Object> constructionGridBoxInfo;
/**
* 工程负责人
*/
private String projectRegionManager;
/**
* 工程负责人电话
*/
private String projectRegionManagerPhone;
/**
* 施工负责人
*/
private String constructionRegionManager;
/**
* 施工负责人电话
*/
private String constructionRegionManagerPhone;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInfoAllDto.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
...@@ -28,4 +32,22 @@ public class SurveyInfoAllDto { ...@@ -28,4 +32,22 @@ public class SurveyInfoAllDto {
//订单跟踪 //订单跟踪
LoggerDto orderTracking; LoggerDto orderTracking;
//工程信息
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
PowerStationConstructionData powerStationConstructionData;
//并网信息
HygfOnGrid hygfOnGrid;
//派工单信息
WorkOrder workOrder;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderDto.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold; import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -46,6 +47,10 @@ public class WorkOrderDto extends BaseDto { ...@@ -46,6 +47,10 @@ public class WorkOrderDto extends BaseDto {
@ApiModelProperty(value = "区域公司orgcode") @ApiModelProperty(value = "区域公司orgcode")
private String regionCode; private String regionCode;
/**
* 区域公司省市区
*/
private String regionAddress;
@ApiModelProperty(value = "工程负责人") @ApiModelProperty(value = "工程负责人")
private String projectRegionManager; private String projectRegionManager;
...@@ -62,5 +67,14 @@ public class WorkOrderDto extends BaseDto { ...@@ -62,5 +67,14 @@ public class WorkOrderDto extends BaseDto {
@ApiModelProperty(value = "派工单状态") @ApiModelProperty(value = "派工单状态")
private String workOrderStatus; private String workOrderStatus;
@ApiModelProperty(value = "平台经销商单位id")
private Long amosDealerId;
@ApiModelProperty(value = "平台经销商单位名称")
private String amosDealerName;
@ApiModelProperty(value = "平台经销商单位orgcode")
private String amosDealerOrgCode;
List<PeasantHousehold> peasantHouseholdId; List<PeasantHousehold> peasantHouseholdId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java 0 → 100644
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import java.lang.reflect.Type;
import java.util.Date;
/**
* @description:
* @author: tw
* @createDate: 2024/1/4
*/
@Data
public class WorkOrderPage {
@ApiModelProperty(value = "农户id")
protected Long sequenceNbr;
@ApiModelProperty(value = "农户信息编号")
private String peasantHouseholdNo;
@ApiModelProperty(value = "派工单编号")
private String workOrderNum;
@ApiModelProperty(value = "业主姓名")
private String ownersName;
@ApiModelProperty(value = "工程负责人")
private String projectRegionManager;
@ApiModelProperty(value = "施工负责人")
private String constructionRegionManager;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "完工时间")
private Date completionDate;
@ApiModelProperty(value = "项目地址")
private String projectAddressName;
@ApiModelProperty(value = "电站施工状态")
private String powerStationConstructionStatus;
@ApiModelProperty(value = "派工电站id")
protected Long workOrderPowerStationId;
@ApiModelProperty(value = "派工单id")
protected String workOrderId;
/**
* 区域公司id
*/
private Long regionCompanyId;
@ApiModelProperty(value = "平台经销商单位id")
private Long amosDealerId;
private String type ;
int current;
int size;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationConstructionData.java
View file @ 91696a8a
...@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity; ...@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 施工电站施工资料 * 施工电站施工资料
...@@ -17,7 +19,7 @@ import java.util.Date; ...@@ -17,7 +19,7 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("hygf_power_station_construction_data") @TableName(value = "hygf_power_station_construction_data",autoResultMap = true)
public class PowerStationConstructionData extends BaseEntity { public class PowerStationConstructionData extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -37,140 +39,140 @@ public class PowerStationConstructionData extends BaseEntity { ...@@ -37,140 +39,140 @@ public class PowerStationConstructionData extends BaseEntity {
/** /**
* 施工交底文件 * 施工交底文件
*/ */
@TableField("construction_instructions_file") @TableField(value ="construction_instructions_file",typeHandler = FastjsonTypeHandler.class)
private String constructionInstructionsFile; private List<Object> constructionInstructionsFile;
/** /**
* 劳动防护用品配置 * 劳动防护用品配置
*/ */
@TableField("labor_protection_equipment_config") @TableField(value ="labor_protection_equipment_config",typeHandler = FastjsonTypeHandler.class)
private String laborProtectionEquipmentConfig; private List<Object> laborProtectionEquipmentConfig;
/** /**
* 施工前安全措施保障视频 * 施工前安全措施保障视频
*/ */
@TableField("safety_precaution_video") @TableField(value ="safety_precaution_video",typeHandler = FastjsonTypeHandler.class)
private String safetyPrecautionVideo; private List<Object> safetyPrecautionVideo;
/** /**
* 支架整体图一 * 支架整体图一
*/ */
@TableField("bracket_overall_plan1") @TableField(value ="bracket_overall_plan1",typeHandler = FastjsonTypeHandler.class)
private String bracketOverallPlan1; private List<Object> bracketOverallPlan1;
/** /**
* 支架整体图二 * 支架整体图二
*/ */
@TableField("bracket_overall_plan2") @TableField(value ="bracket_overall_plan2",typeHandler = FastjsonTypeHandler.class)
private String bracketOverallPlan2; private List<Object> bracketOverallPlan2;
/** /**
* 方阵倾角测试照片/规模 * 方阵倾角测试照片/规模
*/ */
@TableField("array_inclination_test_photo") @TableField(value ="array_inclination_test_photo",typeHandler = FastjsonTypeHandler.class)
private String arrayInclinationTestPhoto; private List<Object> arrayInclinationTestPhoto;
/** /**
* 方阵整体图一（全景） * 方阵整体图一（全景）
*/ */
@TableField("array_overall_plan1") @TableField(value ="array_overall_plan1",typeHandler = FastjsonTypeHandler.class)
private String arrayOverallPlan1; private List<Object> arrayOverallPlan1;
/** /**
* 方阵整体图二 * 方阵整体图二
*/ */
@TableField("array_overall_plan2") @TableField(value ="array_overall_plan2",typeHandler = FastjsonTypeHandler.class)
private String arrayOverallPlan2; private List<Object> arrayOverallPlan2;
/** /**
* 方阵整体图三 * 方阵整体图三
*/ */
@TableField("array_overall_plan3") @TableField(value ="array_overall_plan3",typeHandler = FastjsonTypeHandler.class)
private String arrayOverallPlan3; private List<Object> arrayOverallPlan3;
/** /**
* 逆变器整体图 * 逆变器整体图
*/ */
@TableField("inverter_overall_plan") @TableField(value ="inverter_overall_plan",typeHandler = FastjsonTypeHandler.class)
private String inverterOverallPlan; private List<Object> inverterOverallPlan;
/** /**
* 光伏电缆走线 * 光伏电缆走线
*/ */
@TableField("photovoltaic_cable_routing") @TableField(value ="photovoltaic_cable_routing",typeHandler = FastjsonTypeHandler.class)
private String photovoltaicCableRouting; private List<Object> photovoltaicCableRouting;
/** /**
* 电表箱外部整体 * 电表箱外部整体
*/ */
@TableField("electricity_meter_box_exterior") @TableField(value ="electricity_meter_box_exterior",typeHandler = FastjsonTypeHandler.class)
private String electricityMeterBoxExterior; private List<Object> electricityMeterBoxExterior;
/** /**
* 电表箱内部整体 * 电表箱内部整体
*/ */
@TableField("electricity_meter_box_interior") @TableField(value ="electricity_meter_box_interior",typeHandler = FastjsonTypeHandler.class)
private String electricityMeterBoxInterior; private List<Object> electricityMeterBoxInterior;
/** /**
* 支架接地 * 支架接地
*/ */
@TableField("bracket_grounding") @TableField(value ="bracket_grounding",typeHandler = FastjsonTypeHandler.class)
private String bracketGrounding; private List<Object> bracketGrounding;
/** /**
* 接地点 * 接地点
*/ */
@TableField("grounding_point") @TableField(value ="grounding_point",typeHandler = FastjsonTypeHandler.class)
private String groundingPoint; private List<Object> groundingPoint;
/** /**
* 交流电缆走线 * 交流电缆走线
*/ */
@TableField("ac_cable_routing") @TableField(value ="ac_cable_routing",typeHandler = FastjsonTypeHandler.class)
private String acCableRouting; private List<Object> acCableRouting;
/** /**
* 其他照片 * 其他照片
*/ */
@TableField("other_photos") @TableField(value ="other_photos",typeHandler = FastjsonTypeHandler.class)
private String otherPhotos; private List<Object> otherPhotos;
/** /**
* 备案附件 * 备案附件
*/ */
@TableField("archive_attachments") @TableField(value ="archive_attachments",typeHandler = FastjsonTypeHandler.class)
private String archiveAttachments; private List<Object> archiveAttachments;
/** /**
* 安装人员信息 * 安装人员信息
*/ */
@TableField("installer_info") @TableField(value ="installer_info",typeHandler = FastjsonTypeHandler.class)
private String installerInfo; private List<Object> installerInfo;
/** /**
* 施工组件信息 * 施工组件信息
*/ */
@TableField("construction_component_info") @TableField(value ="construction_component_info",typeHandler = FastjsonTypeHandler.class)
private String constructionComponentInfo; private List<Object> constructionComponentInfo;
/** /**
* 施工逆变器信息 * 施工逆变器信息
*/ */
@TableField("construction_inverter_info") @TableField(value ="construction_inverter_info",typeHandler = FastjsonTypeHandler.class)
private String constructionInverterInfo; private List<Object> constructionInverterInfo;
/** /**
* 施工采集器信息 * 施工采集器信息
*/ */
@TableField("construction_collector_box_info") @TableField(value ="construction_collector_box_info",typeHandler = FastjsonTypeHandler.class)
private String constructionCollectorBoxInfo; private List<Object> constructionCollectorBoxInfo;
/** /**
* 施工并网箱信息 * 施工并网箱信息
*/ */
@TableField("construction_grid_box_info") @TableField(value = "construction_grid_box_info",typeHandler = FastjsonTypeHandler.class)
private String constructionGridBoxInfo; private List<Object> constructionGridBoxInfo;
/** /**
* *
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationEngineeringInfo.java
View file @ 91696a8a
...@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity; ...@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 施工电站工程信息 * 施工电站工程信息
...@@ -17,7 +19,7 @@ import java.util.Date; ...@@ -17,7 +19,7 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("hygf_power_station_engineering_info") @TableName(value = "hygf_power_station_engineering_info",autoResultMap = true)
public class PowerStationEngineeringInfo extends BaseEntity { public class PowerStationEngineeringInfo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -100,4 +102,62 @@ public class PowerStationEngineeringInfo extends BaseEntity { ...@@ -100,4 +102,62 @@ public class PowerStationEngineeringInfo extends BaseEntity {
@TableField("work_order_power_station_id") @TableField("work_order_power_station_id")
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("completion_date")
private Date completionDate;
/**
* 施工组件信息
*/
@TableField(exist = false)
private List<Object> constructionComponentInfo;
/**
* 施工逆变器信息
*/
@TableField(exist = false)
private List<Object> constructionInverterInfo;
/**
* 施工采集器信息
*/
@TableField(exist = false)
private List<Object> constructionCollectorBoxInfo;
/**
* 施工并网箱信息
*/
@TableField(exist = false)
private List<Object> constructionGridBoxInfo;
/**
* 工程负责人
*/
@TableField(exist = false)
private String projectRegionManager;
/**
* 工程负责人电话
*/
@TableField(exist = false)
private String projectRegionManagerPhone;
/**
* 施工负责人
*/
@TableField(exist = false)
private String constructionRegionManager;
/**
* 施工负责人电话
*/
@TableField(exist = false)
private String constructionRegionManagerPhone;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java
View file @ 91696a8a
...@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.entity; ...@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -38,18 +42,21 @@ public class WorkOrder extends BaseEntity { ...@@ -38,18 +42,21 @@ public class WorkOrder extends BaseEntity {
/** /**
* 制单日期 * 制单日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("issue_date") @TableField("issue_date")
private Date issueDate; private Date issueDate;
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("planned_start_date") @TableField("planned_start_date")
private Date plannedStartDate; private Date plannedStartDate;
/** /**
* 计划完工日期 * 计划完工日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("planned_end_date") @TableField("planned_end_date")
private Date plannedEndDate; private Date plannedEndDate;
...@@ -68,9 +75,17 @@ public class WorkOrder extends BaseEntity { ...@@ -68,9 +75,17 @@ public class WorkOrder extends BaseEntity {
/** /**
* 区域公司orgcode * 区域公司orgcode
*/ */
@TableField("region__code") @TableField("region_code")
private String regionCode; private String regionCode;
/**
* 区域公司省市区
*/
@TableField("region_address")
private String regionAddress;
/** /**
* 工程负责人 * 工程负责人
*/ */
...@@ -102,8 +117,37 @@ public class WorkOrder extends BaseEntity { ...@@ -102,8 +117,37 @@ public class WorkOrder extends BaseEntity {
private String workOrderStatus; private String workOrderStatus;
@ApiModelProperty(value = "平台经销商单位id")
@TableField("amos_dealer_id")
private Long amosDealerId;
@ApiModelProperty(value = "平台经销商单位名称")
@TableField("amos_dealer_name")
private String amosDealerName;
@ApiModelProperty(value = "平台经销商单位orgcode")
@TableField("amos_dealer_org_code")
private String amosDealerOrgCode;
@TableField(exist = false) @TableField(exist = false)
List<PeasantHousehold> peasantHouseholdId; List<PeasantHousehold> peasantHouseholdId;
@TableField(exist = false)
int peasantHouseholdNum;//施工电站数
@TableField(exist = false)
int peasantHouseholdSgNum;//已施工电站数
/**
* 经销商单位
* */
@TableField(exist = false)
private Long developerId;
@TableField(exist = false)
int current;
@TableField(exist = false)
int size;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrderPowerStation.java
View file @ 91696a8a
...@@ -23,17 +23,18 @@ public class WorkOrderPowerStation extends BaseEntity { ...@@ -23,17 +23,18 @@ public class WorkOrderPowerStation extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* * 派单id
*/ */
@TableField("work_order_id") @TableField("work_order_id")
private Long workOrderId; private Long workOrderId;
/** /**
* * 电站id
*/ */
@TableField("peasant_household_id") @TableField("peasant_household_id")
private Long peasantHouseholdId; private Long peasantHouseholdId;
/** /**
* 电站施工状态 * 电站施工状态
*/ */
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java
View file @ 91696a8a
...@@ -22,6 +22,7 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> { ...@@ -22,6 +22,7 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
IPage<CompanyDto> getCompanyDto(@Param("dto") CompanyDto dto); IPage<CompanyDto> getCompanyDto(@Param("dto") CompanyDto dto);
Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto); Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId); List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderMapper.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.mapper; package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder; import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import lombok.Data;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 施工派工工单 Mapper 接口 * 施工派工工单 Mapper 接口
...@@ -10,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -10,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2024-01-02 * @date 2024-01-02
*/ */
public interface WorkOrderMapper extends BaseMapper<WorkOrder> { public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
List<WorkOrder> selectWorkOrderList(@Param("dto") WorkOrder dto);
List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderPowerStationMapper.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.api.mapper; package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrderPowerStation; import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrderPowerStation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 施工派工单电站 Mapper 接口 * 施工派工单电站 Mapper 接口
...@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerStation> { public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerStation> {
List<PeasantHousehold> selectPeasantHousehold(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 91696a8a
...@@ -32,6 +32,9 @@ and hygf_document_station.station_id is not null ...@@ -32,6 +32,9 @@ and hygf_document_station.station_id is not null
hygf_peasant_household.construction_state='已收货' hygf_peasant_household.construction_state='已收货'
and hygf_peasant_household.developer_id=#{developerId} and hygf_peasant_household.developer_id=#{developerId}
and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq} and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
and hygf_peasant_household.sequence_nbr not in (
select hygf_work_order_power_station.peasant_household_id from hygf_work_order_power_station
)
<if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''"> <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%") and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
</if> </if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml
View file @ 91696a8a
...@@ -40,9 +40,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP' ...@@ -40,9 +40,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<select id="getuserList" resultType="Map"> <select id="getuserList" resultType="Map">
select select
std_user_biz.amos_user_id amosUserId, DISTINCT std_user_biz.real_name realName
std_user_biz.real_name realName,
std_user_biz.emergency_telephone emergencyTelephone
from from
std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
...@@ -64,4 +62,32 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP' ...@@ -64,4 +62,32 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
</select> </select>
<select id="getuserListtelephone" resultType="Map">
select
std_user_biz.emergency_telephone emergencyTelephone
from
std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
<where>
<if test="role!=null">
and std_user_biz.role like concat(concat("%",#{role}),"%")
</if>
<if test="regionalCompaniesSeq!=null">
and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
</if>
<if test="amosUnitId!=null">
and hygf_personnel_business.amos_unit_id=#{amosUnitId}
</if>
<if test="userName!=null">
and std_user_biz.real_name=#{userName}
</if>
</where>
LIMIT 1
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml
View file @ 91696a8a
...@@ -2,4 +2,102 @@ ...@@ -2,4 +2,102 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.WorkOrderMapper"> <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderMapper">
<select id="selectWorkOrderList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder" >
SELECT
hygf_work_order.*,
(SELECT count(*) from hygf_work_order_power_station where hygf_work_order_power_station.work_order_id = hygf_work_order.sequence_nbr ) peasantHouseholdNum,
(SELECT count(*) from hygf_work_order_power_station where hygf_work_order_power_station.work_order_id = hygf_work_order.sequence_nbr
and hygf_work_order_power_station.power_station_construction_status in ("待登记","未通过","已完工","待审核")
) peasantHouseholdSgNum
FROM hygf_work_order WHERE hygf_work_order.is_delete=0
<if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")
</if>
<if test="dto.projectRegionManager!=null and dto.projectRegionManager!=''">
and hygf_work_order.project_region_manager like concat(concat("%",#{dto.projectRegionManager}),"%")
</if>
<if test="dto.workOrderStatus!=null and dto.workOrderStatus!=''">
and hygf_work_order.work_order_status=#{dto.workOrderStatus}
</if>
<if test="dto.amosDealerId!=null and dto.amosDealerId!=''">
and hygf_work_order.amos_dealer_id = #{dto.amosDealerId}
</if>
<if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{dto.regionCompanyId}
</if>
ORDER BY hygf_work_order.rec_date DESC
</select>
<select id="queryForwgpage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage" >
select
hygf_peasant_household.sequence_nbr sequenceNbr,
hygf_peasant_household.peasant_household_no peasantHouseholdNo,
hygf_work_order.work_order_num workOrderNum,
hygf_peasant_household.owners_name ownersName,
hygf_work_order.project_region_manager projectRegionManager,
hygf_work_order.construction_region_manager constructionRegionManager,
hygf_power_station_engineering_info.completion_date completionDate ,
hygf_peasant_household.project_address_name projectAddressName,
hygf_work_order_power_station.power_station_construction_status powerStationConstructionStatus,
hygf_work_order_power_station.sequence_nbr workOrderPowerStationId
from hygf_work_order_power_station LEFT join hygf_work_order
on hygf_work_order.sequence_nbr=hygf_work_order_power_station.work_order_id
LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id
LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_id=hygf_work_order.sequence_nbr
<where>
<if test="dto.workOrderId!=null and dto.workOrderId!=''">
and hygf_work_order.sequence_nbr = #{dto.workOrderId}
</if>
<if test=' dto.type!=null and dto.type == "1"'>
and hygf_work_order_power_station.power_station_construction_status in ("待登记","未通过","已完工","待审核")
</if>
<if test=' dto.type !=null and dto.type == "2"'>
and hygf_work_order_power_station.power_station_construction_status in ("未通过","已完工","待审核")
</if>
<if test="dto.projectAddressName!=null and dto.projectAddressName!=''">
and hygf_peasant_household.project_address_name like concat(concat("%",#{dto.projectAddressName}),"%")
</if>
<if test="dto.peasantHouseholdNo!=null and dto.peasantHouseholdNo!=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{dto.peasantHouseholdNo}),"%")
</if>
<if test="dto.ownersName!=null and dto.ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat("%",#{dto.ownersName}),"%")
</if>
<if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")
</if>
<if test="dto.projectRegionManager!=null and dto.projectRegionManager!=''">
and hygf_work_order.project_region_manager like concat(concat("%",#{dto.projectRegionManager}),"%")
</if>
<if test="dto.powerStationConstructionStatus!=null and dto.powerStationConstructionStatus!=''">
and hygf_work_order_power_station.power_station_construction_status=#{dto.powerStationConstructionStatus}
</if>
<if test="dto.amosDealerId!=null and dto.amosDealerId!=''">
and hygf_work_order.amos_dealer_id = #{dto.amosDealerId}
</if>
<if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{dto.regionCompanyId}
</if>
ORDER BY hygf_work_order_power_station.rec_date DESC
</where>
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @ 91696a8a
...@@ -2,4 +2,21 @@ ...@@ -2,4 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.WorkOrderPowerStationMapper"> <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderPowerStationMapper">
<select id="selectPeasantHousehold" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
SELECT
hygf_peasant_household.*
FROM
hygf_work_order_power_station
LEFT JOIN hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
WHERE
hygf_work_order_power_station.work_order_id=#{sequenceNbr}
<if test="ownersName!=null and ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
</if>
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 91696a8a
...@@ -819,7 +819,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser( ...@@ -819,7 +819,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
public ResponseModel< Map<String,Object> > getuserTelephone( @RequestParam(required=false) String userName public ResponseModel< Map<String,Object> > getuserTelephone( @RequestParam(required=false) String userName
) { Map<String,Object> data=null; ) { Map<String,Object> data=null;
if(StringUtils.isNotEmpty(userName)){ if(StringUtils.isNotEmpty(userName)){
List<Map<String,Object>> date= unitInfoMapper.getuserList(userName,null,null,null); List<Map<String,Object>> date= unitInfoMapper.getuserListtelephone(userName,null,null,null);
if(date!=null&&!date.isEmpty()){ if(date!=null&&!date.isEmpty()){
data=date.get(0); data=date.get(0);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.biz.controller; package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder; import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationConstructionDataMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderPowerStationMapper;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.POST;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
...@@ -31,7 +46,15 @@ public class WorkOrderController extends BaseController { ...@@ -31,7 +46,15 @@ public class WorkOrderController extends BaseController {
@Autowired @Autowired
WorkOrderServiceImpl workOrderServiceImpl; WorkOrderServiceImpl workOrderServiceImpl;
@Autowired
WorkOrderPowerStationMapper workOrderPowerStationMapper;
@Autowired
WorkOrderMapper workOrderMapper;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
PowerStationConstructionDataMapper powerStationConstructionDataMapper;
/** /**
* 新增施工派工工单 * 新增施工派工工单
* *
...@@ -41,7 +64,8 @@ public class WorkOrderController extends BaseController { ...@@ -41,7 +64,8 @@ public class WorkOrderController extends BaseController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增施工派工工单", notes = "新增施工派工工单") @ApiOperation(httpMethod = "POST", value = "新增施工派工工单", notes = "新增施工派工工单")
public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) { public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) {
model = workOrderServiceImpl.saveWorkOrder(model); UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
model = workOrderServiceImpl.saveWorkOrder(model,userUnitInformationDto);
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
...@@ -54,9 +78,10 @@ public class WorkOrderController extends BaseController { ...@@ -54,9 +78,10 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新施工派工工单", notes = "根据sequenceNbr更新施工派工工单") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新施工派工工单", notes = "根据sequenceNbr更新施工派工工单")
public ResponseModel<WorkOrderDto> updateBySequenceNbrWorkOrder(@RequestBody WorkOrderDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<WorkOrder> updateBySequenceNbrWorkOrder(@RequestBody WorkOrder model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(workOrderServiceImpl.updateWithModel(model)); UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
return ResponseHelper.buildResponse(workOrderServiceImpl.updateWorkOrder(model,userUnitInformationDto));
} }
/** /**
...@@ -81,10 +106,19 @@ public class WorkOrderController extends BaseController { ...@@ -81,10 +106,19 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工工单", notes = "根据sequenceNbr查询单个施工派工工单") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工工单", notes = "根据sequenceNbr查询单个施工派工工单")
public ResponseModel<WorkOrderDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<WorkOrder> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(workOrderServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(workOrderServiceImpl.selectOne(sequenceNbr));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectOneall")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工工单", notes = "根据sequenceNbr查询单个施工派工工单")
public ResponseModel<Map<String,Object>> selectOneall(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(workOrderServiceImpl.selectOneall(sequenceNbr));
}
/** /**
* 列表分页查询 * 列表分页查询
* *
...@@ -93,14 +127,17 @@ public class WorkOrderController extends BaseController { ...@@ -93,14 +127,17 @@ public class WorkOrderController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @PostMapping (value = "/page")
@ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询", notes = "施工派工工单分页查询") @ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询", notes = "施工派工工单分页查询")
public ResponseModel<Page<WorkOrderDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<WorkOrder>> queryForPage(@RequestBody WorkOrder workOrder
(value = "size") int size) { ) {
Page<WorkOrderDto> page = new Page<WorkOrderDto>();
page.setCurrent(current); UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
page.setSize(size);
return ResponseHelper.buildResponse(workOrderServiceImpl.queryForWorkOrderPage(page)); workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
return ResponseHelper.buildResponse(workOrderServiceImpl.selectPage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
} }
/** /**
...@@ -114,4 +151,132 @@ public class WorkOrderController extends BaseController { ...@@ -114,4 +151,132 @@ public class WorkOrderController extends BaseController {
public ResponseModel<List<WorkOrderDto>> selectForList() { public ResponseModel<List<WorkOrderDto>> selectForList() {
return ResponseHelper.buildResponse(workOrderServiceImpl.queryForWorkOrderList()); return ResponseHelper.buildResponse(workOrderServiceImpl.queryForWorkOrderList());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getWorkOrderHousehold")
public ResponseModel< Page<PeasantHousehold> > getPeasantHouseholdData(
@RequestParam(required=false) Long sequenceNbr,
@RequestParam(required=false) String ownersName
) {
List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,ownersName);
Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
pagenew.setRecords(list);
return ResponseHelper.buildResponse(pagenew);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/wgpage")
@ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询", notes = "施工派工工单分页查询")
public ResponseModel<Page<WorkOrderPage>> queryForwgpage(
@RequestBody WorkOrderPage workOrder
) {
//当前登录人所属场站
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
return ResponseHelper.buildResponse(workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/wgpageList")
@ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询")
public ResponseModel<List<WorkOrderPage>> wgpageList(
@RequestBody WorkOrderPage workOrder
) {
//当前登录人所属场站
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
List<WorkOrderPage> list=workOrderMapper.queryForwgpage(workOrder);
return ResponseHelper.buildResponse(list);
}
//获取施工资料详情
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/getPowerStationConstructionData")
@ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询")
public ResponseModel<Map<String,Object>> getPowerStationConstructionData(
@RequestBody PowerStationConstructionData powerStationConstructionData
) {
//查询施工信息
LambdaQueryWrapper<PowerStationConstructionData> up=new LambdaQueryWrapper<>();
up.eq(PowerStationConstructionData::getWorkOrderId,powerStationConstructionData.getWorkOrderId());
up.eq(PowerStationConstructionData::getWorkOrderPowerStationId,powerStationConstructionData.getWorkOrderPowerStationId());
PowerStationConstructionData da= powerStationConstructionDataMapper.selectOne(up);
Map<String,Object> map =new HashMap<>();
map.put("powerStationConstructionData",da!=null?da:new PowerStationConstructionData());
map.put("powerStationConstructionDatafj",da!=null?da:new PowerStationConstructionData());
return ResponseHelper.buildResponse(map);
}
//施工信息添加
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/addOrUpdate")
@ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询")
public ResponseModel<PowerStationConstructionData> addOrUpdate(
@RequestBody PowerStationConstructionData powerStationConstructionData
) {
return ResponseHelper.buildResponse( workOrderServiceImpl.addOrUpdate(powerStationConstructionData));
}
/**
* 勘察信息编辑
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "电站详情", notes = "勘察信息编辑")
@GetMapping(value = "/getsurveyQueryxq")
public ResponseModel<SurveyInfoAllDto> getsurveyQueryxq(@RequestParam(value = "peasantHouseholdId" ) Long peasantHouseholdId,
@RequestParam(value = "workOrderId") Long workOrderId,
@RequestParam(value = "workOrderPowerStationId")Long workOrderPowerStationId) {
SurveyInfoAllDto returnDto = workOrderServiceImpl.getsurveyQueryxq(peasantHouseholdId,workOrderId,workOrderPowerStationId);
return ResponseHelper.buildResponse(returnDto);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "完工登记详情", notes = "完工登记详情")
@GetMapping(value = "/getPowerStationEngineeringInfo")
public ResponseModel<PowerStationEngineeringInfoAllDto> getPowerStationEngineeringInfo(@RequestParam(value = "workOrderPowerStationId")Long workOrderPowerStationId) {
PowerStationEngineeringInfoAllDto returnDto = workOrderServiceImpl.getPowerStationEngineeringInfo(workOrderPowerStationId);
return ResponseHelper.buildResponse(returnDto);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "完工登记", notes = "完工登记")
@PostMapping (value = "/addPowerStationEngineeringInfo")
public ResponseModel<PowerStationEngineeringInfoAllDto> addPowerStationEngineeringInfo(
@RequestBody PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto
) {
workOrderServiceImpl.addPowerStationEngineeringInfo(powerStationEngineeringInfoAllDto);
return ResponseHelper.buildResponse(powerStationEngineeringInfoAllDto);
}
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 91696a8a
package com.yeejoin.amos.boot.module.hygf.biz.service.impl; package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold; import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper; import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationConstructionDataService;
import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService; import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderDto; import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil; import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
import java.util.*;
/** /**
* 施工派工工单服务实现类 * 施工派工工单服务实现类
...@@ -31,6 +41,47 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor ...@@ -31,6 +41,47 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
@Autowired @Autowired
WorkOrderMapper workOrderMapper; WorkOrderMapper workOrderMapper;
@Autowired
WorkOrderPowerStationServiceImpl workOrderPowerStationServiceImpl;
@Autowired
WorkOrderPowerStationMapper workOrderPowerStationMapper;
@Autowired
DesignInformationMapper designInformationMapper;
@Autowired
PowerStationConstructionDataServiceImpl powerStationConstructionDataService;
@Autowired
SurveyDetailsServiceImpl surveyDetailsService;
@Autowired
InformationServiceImpl informationService;
@Autowired
ExtendedInformationServiceImpl extendedInformationService;
@Autowired
CommercialServiceImpl commercialService;
@Autowired
PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
@Autowired
DesignInformationServiceImpl designInformationService;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
SurveyInformationMapper surveyInformationMapper;
@Autowired
PowerStationConstructionDataMapper powerStationConstructionDataMapper;
@Autowired
PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
@Autowired
HygfOnGridMapper hygfOnGridMapper;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -49,8 +100,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor ...@@ -49,8 +100,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
public WorkOrder saveWorkOrder (WorkOrder model) { public WorkOrder saveWorkOrder (WorkOrder model, UserUnitInformationDto userUnitInformationDto) {
//保存派工单 //保存派工单
RegionalCompanies regionalCompanies= regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId()); RegionalCompanies regionalCompanies= regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
String code= NumberUtil.getCode(CodeEnum.派工单.getCode(),regionalCompanies.getCompanyCode(),regionalCompanies.getRegionalAddress()); String code= NumberUtil.getCode(CodeEnum.派工单.getCode(),regionalCompanies.getCompanyCode(),regionalCompanies.getRegionalAddress());
...@@ -58,19 +108,588 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor ...@@ -58,19 +108,588 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
model.setRegionCompanyName(regionalCompanies.getRegionalCompaniesName()); model.setRegionCompanyName(regionalCompanies.getRegionalCompaniesName());
model.setRegionCode(regionalCompanies.getRegionalCompaniesCode()); model.setRegionCode(regionalCompanies.getRegionalCompaniesCode());
model.setWorkOrderStatus(WorkOrderEnum.待施工.getCode()); model.setWorkOrderStatus(WorkOrderEnum.待施工.getCode());
workOrderMapper.insert(model); model.setRegionAddress(regionalCompanies.getRegionalAddress());
//获取经销商单位信息
model.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
model.setAmosDealerName(userUnitInformationDto.getAmosDealerName());
model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
workOrderMapper.insert(model);
//保存派工单 电站信息
List<PeasantHousehold> peasantHouseholdId=model.getPeasantHouseholdId();
List<WorkOrderPowerStation> li=new ArrayList<>();
for (PeasantHousehold peasantHousehold : peasantHouseholdId) {
WorkOrderPowerStation workOrderPowerStation=new WorkOrderPowerStation();
workOrderPowerStation.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
workOrderPowerStation.setWorkOrderId(model.getSequenceNbr());
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待施工.getCode());
li.add(workOrderPowerStation);
}
workOrderPowerStationServiceImpl.saveBatch(li);
return model;
}
public WorkOrder updateWorkOrder (WorkOrder model, UserUnitInformationDto userUnitInformationDto) {
//保存派工单
RegionalCompanies regionalCompanies= regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
model.setRegionCompanyName(regionalCompanies.getRegionalCompaniesName());
model.setRegionCode(regionalCompanies.getRegionalCompaniesCode());
model.setWorkOrderStatus(WorkOrderEnum.待施工.getCode());
model.setRegionAddress(regionalCompanies.getRegionalAddress());
//获取经销商单位信息
model.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
model.setAmosDealerName(userUnitInformationDto.getAmosDealerName());
model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
workOrderMapper.updateById(model);
LambdaQueryWrapper<WorkOrderPowerStation> up=new LambdaQueryWrapper();
up.eq(WorkOrderPowerStation::getWorkOrderId,model.getSequenceNbr());
workOrderPowerStationMapper.delete(up);
//保存派工单 电站信息 //保存派工单 电站信息
List<PeasantHousehold> peasantHouseholdId=model.getPeasantHouseholdId(); List<PeasantHousehold> peasantHouseholdId=model.getPeasantHouseholdId();
List<WorkOrderPowerStation> li=new ArrayList<>();
for (PeasantHousehold peasantHousehold : peasantHouseholdId) {
WorkOrderPowerStation workOrderPowerStation=new WorkOrderPowerStation();
workOrderPowerStation.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
workOrderPowerStation.setWorkOrderId(model.getSequenceNbr());
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待施工.getCode());
li.add(workOrderPowerStation);
}
workOrderPowerStationServiceImpl.saveBatch(li);
return model;
}
public WorkOrder selectOne(Long sequenceNbr) {
WorkOrder model= workOrderMapper.selectById(sequenceNbr);
List<PeasantHousehold> li=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,null);
model.setPeasantHouseholdId(li);
return model;
}
public Map<String,Object> selectOneall(Long sequenceNbr) {
WorkOrder model= workOrderMapper.selectById(sequenceNbr);
List<PeasantHousehold> lih=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,null);
return model; //获取所有电站Bom，分组合并，暂时不相加
List<Long> ids=new ArrayList<>();
for (PeasantHousehold documentStation : lih) {
ids.add(documentStation.getSequenceNbr());
}
QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
designInformationQueryWrapper.in("peasant_household_id", ids);
List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper);
DesignInformation designInformation=new DesignInformation();
//组件
List<Object> assembly=new ArrayList<>();
//逆变器
List<Object> inverter=new ArrayList<>();
//电表箱
List<Object> electricityMeter=new ArrayList<>();
//电缆
List<Object> cable=new ArrayList<>();
for (DesignInformation des : li) {
if(des.getAssembly()!=null&&!des.getAssembly().isEmpty()){
assembly.addAll(des.getAssembly());
}
if(des.getInverter()!=null&&!des.getInverter().isEmpty()){
inverter.addAll(des.getInverter());
}
if(des.getElectricityMeter()!=null&&!des.getElectricityMeter().isEmpty()){
electricityMeter.addAll(des.getElectricityMeter());
}
if(des.getCable()!=null&&!des.getCable().isEmpty()){
cable.addAll(des.getCable());
}
}
List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,null);
Map<String,Object> map =new HashMap<>();
designInformation.setAssembly(assembly);
designInformation.setInverter(inverter);
designInformation.setElectricityMeter(electricityMeter);
designInformation.setCable(cable);
map.put("workOrder",model);
map.put("designInformation",designInformation);
map.put("peasantHousehold",list);
return map;
} }
@Transactional
public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData){
// if(powerStationConstructionData.getSequenceNbr()!=null){
//修改施工电站状态
LambdaUpdateWrapper<WorkOrderPowerStation> up=new LambdaUpdateWrapper();
up.eq(WorkOrderPowerStation::getSequenceNbr,powerStationConstructionData.getWorkOrderPowerStationId());
if(powerStationConstructionData.getConstructionStatus().equals("未完成")){
up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.施工中.getCode());
}else{
up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待登记.getCode());
}
workOrderPowerStationMapper.update(null,up);
//修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getWorkOrderId,powerStationConstructionData.getWorkOrderId());
List<String> d=new ArrayList<>();
d.add(WorkOrderEnum.施工中.getCode());
d.add(WorkOrderEnum.待施工.getCode());
qu.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d);
List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,powerStationConstructionData.getWorkOrderId());
if(list!=null&&!list.isEmpty()){
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.施工中.getCode());
}else{
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.登记中.getCode());
}
workOrderMapper.update(null,upq);
//新增施工信息
powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
// }else{
// //修改施工电站状态
// LambdaUpdateWrapper<WorkOrderPowerStation> up=new LambdaUpdateWrapper();
// up.eq(WorkOrderPowerStation::getSequenceNbr,powerStationConstructionData.getWorkOrderPowerStationId());
// if(powerStationConstructionData.getConstructionStatus().equals("未完成")){
// up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.施工中.getCode());
// }else{
// up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待登记.getCode());
// }
// workOrderPowerStationMapper.update(null,up);
// //修改派工单状态
// LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
// qu.eq(WorkOrderPowerStation::getWorkOrderId,powerStationConstructionData.getWorkOrderId());
// qu.eq(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待施工.getCode());
// List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu);
//
//
// LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
// upq.eq(WorkOrder::getSequenceNbr,powerStationConstructionData.getWorkOrderId());
// if(list!=null&&!list.isEmpty()){
// upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.施工中.getCode());
// }else{
// upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.登记中.getCode());
// }
// workOrderMapper.update(null,upq);
// //修改施工信息
//
//
// }
return powerStationConstructionData;
}
public Page<WorkOrder> selectPage( int pageNum,int pageSize, WorkOrder workOrder){
PageHelper.startPage(pageNum, pageSize);
List<WorkOrder> list=workOrderMapper.selectWorkOrderList(workOrder);
PageInfo<WorkOrder> page = new PageInfo(list);
Page<WorkOrder> pagenew = new Page<WorkOrder>();
pagenew.setCurrent(pageNum);
pagenew.setTotal(page.getTotal());
pagenew.setSize(pageSize);
pagenew.setRecords(page.getList());
return pagenew;
}
public Page<WorkOrderPage> queryForwgpage( int pageNum,int pageSize, WorkOrderPage workOrder){
PageHelper.startPage(pageNum, pageSize);
List<WorkOrderPage> list=workOrderMapper.queryForwgpage(workOrder);
PageInfo<WorkOrderPage> page = new PageInfo(list);
Page<WorkOrderPage> pagenew = new Page<WorkOrderPage>();
pagenew.setCurrent(pageNum);
pagenew.setTotal(page.getTotal());
pagenew.setSize(pageSize);
pagenew.setRecords(page.getList());
return pagenew;
}
public SurveyInfoAllDto getsurveyQueryxq(Long peasantHouseholdId,Long workOrderId,Long workOrderPowerStationId) {
SurveyInfoAllDto surveyInfoAllDto = new SurveyInfoAllDto();
PeasantHousehold peasantHousehold = new PeasantHousehold();
LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();
peasantHouseholdWrapper.eq(PeasantHousehold::getSequenceNbr, peasantHouseholdId);
peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdWrapper);
String surveyInformationId = String.valueOf(peasantHousehold.getSurveyInformationId());
//勘察基本信息
LambdaQueryWrapper<SurveyInformation> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SurveyInformation::getSequenceNbr, surveyInformationId);
SurveyInformation surveyInformation = surveyInformationMapper.selectOne(queryWrapper);
surveyInfoAllDto.setSurveyInformation(BeanDtoUtils.convert(surveyInformation, SurveyInformationDto.class));
//农户信息
//获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(peasantHousehold.getDeveloperUserId());
BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
surveyInfoAllDto.getSurveyInformation().setDeveloperName(userUnitInformationDto.getAmosDealerName());
surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userUnitInformationDto.getAmosDealerOrgCode());
surveyInfoAllDto.getSurveyInformation().setDeveloperId(userUnitInformationDto.getAmosDealerId());
if (!StringUtils.isEmpty(peasantHousehold.getProjectAddressName())) {
surveyInfoAllDto.getSurveyInformation().setProjectAddressText(Arrays.asList(peasantHousehold.getProjectAddressName().split("/")));
}
if(!StringUtils.isEmpty(peasantHousehold.getPermanentAddressName())){
surveyInfoAllDto.getSurveyInformation().setPermanentAddressText(Arrays.asList(peasantHousehold.getPermanentAddressName().split("/")));
}
if(peasantHousehold.getPermanentAddress() ==null){
surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress());
surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
}
surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
surveyInfoAllDto.getSurveyInformation().setCreatorTime(new Date());
QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
SurveyDetails surveyDetails = surveyDetailsService.getBaseMapper().selectOne(surveyDetailsQueryWrapper);
if(surveyDetails == null){
surveyInfoAllDto.setSurveyDetails(new SurveyDetailsDto());
}else {
surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
}
QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
informationQueryWrapper.eq("survey_information_id", surveyInformationId);
Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
if(information == null){
surveyInfoAllDto.setInformation(new InformationDto());
}else {
surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
}
QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
if(commercial==null){
commercial=new Commercial();
}
commercial.setApplicant(peasantHousehold.getOwnersName());
commercial.setIdCard(peasantHousehold.getIdCard());
commercial.setTelephone(peasantHousehold.getTelephone());
commercial.setProjectAddress(peasantHousehold.getProjectAddress());
commercial.setProjectAddressName(peasantHousehold.getProjectAddressName());
commercial.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
commercial.setLegalContactTelephone(peasantHousehold.getTelephone());
if(information == null){
CommercialDto commercialDto = BeanDtoUtils.convert(commercial, CommercialDto.class);
commercialDto.setType("zrr");
commercialDto.setLegalType("zjdnhw");
surveyInfoAllDto.setCommercial(commercialDto);
}else {
surveyInfoAllDto.setCommercial(BeanDtoUtils.convert(commercial, CommercialDto.class));
if(commercial !=null && !StringUtils.isEmpty(commercial.getProjectAddressName())){
surveyInfoAllDto.getCommercial().setProjectAddressText(Arrays.asList(commercial.getProjectAddressName().split("/")));
}
}
QueryWrapper<ExtendedInformation> extendedInformationQueryWrapper = new QueryWrapper<>();
extendedInformationQueryWrapper.eq("survey_information_id", surveyInformationId);
ExtendedInformation extendedInformation = extendedInformationService.getBaseMapper().selectOne(extendedInformationQueryWrapper);
if(information == null){
surveyInfoAllDto.setExtendedInformation(new ExtendedInformationDto());
}else {
surveyInfoAllDto.setExtendedInformation(BeanDtoUtils.convert(extendedInformation, ExtendedInformationDto.class));
}
QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
designInformationQueryWrapper.eq("peasant_household_id", peasantHousehold.getSequenceNbr());
DesignInformation designInformation = designInformationService.getBaseMapper().selectOne(designInformationQueryWrapper);
if(designInformation == null){
surveyInfoAllDto.setDesignInformation(new DesignInformationDto());
}else {
surveyInfoAllDto.setDesignInformation(BeanDtoUtils.convert(designInformation, DesignInformationDto.class));
}
//派工单信息
LambdaQueryWrapper<WorkOrder> upl=new LambdaQueryWrapper();
upl.eq(WorkOrder::getSequenceNbr,workOrderId);
WorkOrder workOrder= workOrderMapper.selectOne(upl);
//施工信息
LambdaQueryWrapper<PowerStationConstructionData> up2=new LambdaQueryWrapper();
up2.eq(PowerStationConstructionData::getWorkOrderId,workOrderId);
up2.eq(PowerStationConstructionData::getWorkOrderPowerStationId,workOrderPowerStationId);
PowerStationConstructionData powerStationConstructionData=powerStationConstructionDataMapper.selectOne(up2);
//工程信息
LambdaQueryWrapper<PowerStationEngineeringInfo> up3=new LambdaQueryWrapper();
up3.eq(PowerStationEngineeringInfo::getWorkOrderId,workOrderId);
up3.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStationId);
PowerStationEngineeringInfo powerStationEngineeringInfo=powerStationEngineeringInfoMapper.selectOne(up3);
if(powerStationConstructionData!=null){
powerStationEngineeringInfo=powerStationEngineeringInfo!=null?powerStationEngineeringInfo:new PowerStationEngineeringInfo();
powerStationEngineeringInfo.setConstructionComponentInfo(powerStationConstructionData.getConstructionComponentInfo());
powerStationEngineeringInfo.setConstructionInverterInfo(powerStationConstructionData.getConstructionInverterInfo());
powerStationEngineeringInfo.setConstructionCollectorBoxInfo(powerStationConstructionData.getConstructionCollectorBoxInfo());
powerStationEngineeringInfo.setConstructionGridBoxInfo(powerStationConstructionData.getConstructionGridBoxInfo());
powerStationEngineeringInfo.setProjectRegionManager(workOrder.getProjectRegionManager());
powerStationEngineeringInfo.setProjectRegionManagerPhone(workOrder.getProjectRegionManagerPhone());
powerStationEngineeringInfo.setConstructionRegionManager(workOrder.getConstructionRegionManager());
powerStationEngineeringInfo.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
}
//并网信息
LambdaQueryWrapper<HygfOnGrid> up4=new LambdaQueryWrapper();
up4.eq(HygfOnGrid::getWorkOrderId,workOrderId);
up4.eq(HygfOnGrid::getWorkOrderPowerStationId,workOrderPowerStationId);
HygfOnGrid hygfOnGrid=hygfOnGridMapper.selectOne(up4);
surveyInfoAllDto.setHygfOnGrid(hygfOnGrid!=null?hygfOnGrid:new HygfOnGrid());
surveyInfoAllDto.setPowerStationConstructionData(powerStationConstructionData);
surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);
surveyInfoAllDto.setWorkOrder(workOrder);
return surveyInfoAllDto;
}
public PowerStationEngineeringInfoAllDto getPowerStationEngineeringInfo(Long workOrderPowerStationId) {
LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getSequenceNbr,workOrderPowerStationId);
WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
Long peasantHouseholdId=workOrderPowerStation.getPeasantHouseholdId();
Long workOrderId=workOrderPowerStation.getWorkOrderId();
PowerStationEngineeringInfoAllDto surveyInfoAllDto = new PowerStationEngineeringInfoAllDto();
PeasantHousehold peasantHousehold = new PeasantHousehold();
LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();
peasantHouseholdWrapper.eq(PeasantHousehold::getSequenceNbr, peasantHouseholdId);
peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdWrapper);
String surveyInformationId = String.valueOf(peasantHousehold.getSurveyInformationId());
//勘察基本信息
LambdaQueryWrapper<SurveyInformation> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SurveyInformation::getSequenceNbr, surveyInformationId);
SurveyInformation surveyInformation = surveyInformationMapper.selectOne(queryWrapper);
surveyInfoAllDto.setSurveyInformation(BeanDtoUtils.convert(surveyInformation, SurveyInformationDto.class));
//农户信息
//获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(peasantHousehold.getDeveloperUserId());
BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
surveyInfoAllDto.getSurveyInformation().setDeveloperName(userUnitInformationDto.getAmosDealerName());
surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userUnitInformationDto.getAmosDealerOrgCode());
surveyInfoAllDto.getSurveyInformation().setDeveloperId(userUnitInformationDto.getAmosDealerId());
if (!StringUtils.isEmpty(peasantHousehold.getProjectAddressName())) {
surveyInfoAllDto.getSurveyInformation().setProjectAddressText(Arrays.asList(peasantHousehold.getProjectAddressName().split("/")));
}
if(!StringUtils.isEmpty(peasantHousehold.getPermanentAddressName())){
surveyInfoAllDto.getSurveyInformation().setPermanentAddressText(Arrays.asList(peasantHousehold.getPermanentAddressName().split("/")));
}
if(peasantHousehold.getPermanentAddress() ==null){
surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress());
surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
}
surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
surveyInfoAllDto.getSurveyInformation().setCreatorTime(new Date());
QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
SurveyDetails surveyDetails = surveyDetailsService.getBaseMapper().selectOne(surveyDetailsQueryWrapper);
if(surveyDetails == null){
surveyInfoAllDto.setSurveyDetails(new SurveyDetailsDto());
}else {
surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
}
QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
informationQueryWrapper.eq("survey_information_id", surveyInformationId);
Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
if(information == null){
surveyInfoAllDto.setInformation(new InformationDto());
}else {
surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
}
QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
if(commercial==null){
commercial=new Commercial();
}
commercial.setApplicant(peasantHousehold.getOwnersName());
commercial.setIdCard(peasantHousehold.getIdCard());
commercial.setTelephone(peasantHousehold.getTelephone());
commercial.setProjectAddress(peasantHousehold.getProjectAddress());
commercial.setProjectAddressName(peasantHousehold.getProjectAddressName());
commercial.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
commercial.setLegalContactTelephone(peasantHousehold.getTelephone());
if(information == null){
CommercialDto commercialDto = BeanDtoUtils.convert(commercial, CommercialDto.class);
commercialDto.setType("zrr");
commercialDto.setLegalType("zjdnhw");
surveyInfoAllDto.setCommercial(commercialDto);
}else {
surveyInfoAllDto.setCommercial(BeanDtoUtils.convert(commercial, CommercialDto.class));
if(commercial !=null && !StringUtils.isEmpty(commercial.getProjectAddressName())){
surveyInfoAllDto.getCommercial().setProjectAddressText(Arrays.asList(commercial.getProjectAddressName().split("/")));
}
}
QueryWrapper<ExtendedInformation> extendedInformationQueryWrapper = new QueryWrapper<>();
extendedInformationQueryWrapper.eq("survey_information_id", surveyInformationId);
ExtendedInformation extendedInformation = extendedInformationService.getBaseMapper().selectOne(extendedInformationQueryWrapper);
if(information == null){
surveyInfoAllDto.setExtendedInformation(new ExtendedInformationDto());
}else {
surveyInfoAllDto.setExtendedInformation(BeanDtoUtils.convert(extendedInformation, ExtendedInformationDto.class));
}
QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
designInformationQueryWrapper.eq("peasant_household_id", peasantHousehold.getSequenceNbr());
DesignInformation designInformation = designInformationService.getBaseMapper().selectOne(designInformationQueryWrapper);
if(designInformation == null){
surveyInfoAllDto.setDesignInformation(new DesignInformationDto());
}else {
surveyInfoAllDto.setDesignInformation(BeanDtoUtils.convert(designInformation, DesignInformationDto.class));
}
//派工单信息
LambdaQueryWrapper<WorkOrder> upl=new LambdaQueryWrapper();
upl.eq(WorkOrder::getSequenceNbr,workOrderId);
WorkOrder workOrder= workOrderMapper.selectOne(upl);
//施工信息
LambdaQueryWrapper<PowerStationConstructionData> up2=new LambdaQueryWrapper();
up2.eq(PowerStationConstructionData::getWorkOrderId,workOrderId);
up2.eq(PowerStationConstructionData::getWorkOrderPowerStationId,workOrderPowerStationId);
PowerStationConstructionData powerStationConstructionData=powerStationConstructionDataMapper.selectOne(up2);
//工程信息
LambdaQueryWrapper<PowerStationEngineeringInfo> up3=new LambdaQueryWrapper();
up3.eq(PowerStationEngineeringInfo::getWorkOrderId,workOrderId);
up3.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStationId);
PowerStationEngineeringInfo powerStationEngineeringInfo=powerStationEngineeringInfoMapper.selectOne(up3);
if(powerStationConstructionData!=null){
powerStationEngineeringInfo=powerStationEngineeringInfo!=null?powerStationEngineeringInfo:new PowerStationEngineeringInfo();
powerStationEngineeringInfo.setConstructionComponentInfo(powerStationConstructionData.getConstructionComponentInfo());
powerStationEngineeringInfo.setConstructionInverterInfo(powerStationConstructionData.getConstructionInverterInfo());
powerStationEngineeringInfo.setConstructionCollectorBoxInfo(powerStationConstructionData.getConstructionCollectorBoxInfo());
powerStationEngineeringInfo.setConstructionGridBoxInfo(powerStationConstructionData.getConstructionGridBoxInfo());
powerStationEngineeringInfo.setProjectRegionManager(workOrder.getProjectRegionManager());
powerStationEngineeringInfo.setProjectRegionManagerPhone(workOrder.getProjectRegionManagerPhone());
powerStationEngineeringInfo.setConstructionRegionManager(workOrder.getConstructionRegionManager());
powerStationEngineeringInfo.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
}
//并网信息
LambdaQueryWrapper<HygfOnGrid> up4=new LambdaQueryWrapper();
up4.eq(HygfOnGrid::getWorkOrderId,workOrderId);
up4.eq(HygfOnGrid::getWorkOrderPowerStationId,workOrderPowerStationId);
HygfOnGrid hygfOnGrid=hygfOnGridMapper.selectOne(up4);
surveyInfoAllDto.setHygfOnGrid(hygfOnGrid!=null?hygfOnGrid:new HygfOnGrid());
surveyInfoAllDto.setPowerStationConstructionData(powerStationConstructionData);
surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);
surveyInfoAllDto.setWorkOrder(workOrder);
return surveyInfoAllDto;
// LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();
// peasantHouseholdWrapper.eq(PeasantHousehold::getSequenceNbr, peasantHouseholdId);
// peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdWrapper);
// String surveyInformationId = String.valueOf(peasantHousehold.getSurveyInformationId());
//
// //勘察基本信息
// LambdaQueryWrapper<SurveyInformation> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(SurveyInformation::getSequenceNbr, surveyInformationId);
// SurveyInformation surveyInformation = surveyInformationMapper.selectOne(queryWrapper);
// surveyInfoAllDto.setSurveyInformation(BeanDtoUtils.convert(surveyInformation, SurveyInformationDto.class));
//
//
// //获取用户所在经销商单位
// UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(peasantHousehold.getDeveloperUserId());
// BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
// surveyInfoAllDto.getSurveyInformation().setDeveloperName(userUnitInformationDto.getAmosDealerName());
// surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userUnitInformationDto.getAmosDealerOrgCode());
// surveyInfoAllDto.getSurveyInformation().setDeveloperId(userUnitInformationDto.getAmosDealerId());
//
// if (!StringUtils.isEmpty(peasantHousehold.getProjectAddressName())) {
// surveyInfoAllDto.getSurveyInformation().setProjectAddressText(Arrays.asList(peasantHousehold.getProjectAddressName().split("/")));
// }
// if(!StringUtils.isEmpty(peasantHousehold.getPermanentAddressName())){
// surveyInfoAllDto.getSurveyInformation().setPermanentAddressText(Arrays.asList(peasantHousehold.getPermanentAddressName().split("/")));
// }
// if(peasantHousehold.getPermanentAddress() ==null){
// surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress());
// surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
// }
// surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
// surveyInfoAllDto.getSurveyInformation().setCreatorTime(new Date());
//
// //派工单信息
// LambdaQueryWrapper<WorkOrder> upl=new LambdaQueryWrapper();
// upl.eq(WorkOrder::getSequenceNbr,workOrderId);
// WorkOrder workOrder= workOrderMapper.selectOne(upl);
//
// //施工信息
// LambdaQueryWrapper<PowerStationConstructionData> up2=new LambdaQueryWrapper();
// up2.eq(PowerStationConstructionData::getWorkOrderId,workOrderId);
// up2.eq(PowerStationConstructionData::getWorkOrderPowerStationId,workOrderPowerStationId);
// PowerStationConstructionData powerStationConstructionData=powerStationConstructionDataMapper.selectOne(up2);
//
// //工程信息
//
// LambdaQueryWrapper<PowerStationEngineeringInfo> up3=new LambdaQueryWrapper();
// up3.eq(PowerStationEngineeringInfo::getWorkOrderId,workOrderId);
// up3.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStationId);
// PowerStationEngineeringInfo powerStationEngineeringInfo=powerStationEngineeringInfoMapper.selectOne(up3);
// if(powerStationConstructionData!=null){
// powerStationEngineeringInfo=powerStationEngineeringInfo!=null?powerStationEngineeringInfo:new PowerStationEngineeringInfo();
// powerStationEngineeringInfo.setConstructionComponentInfo(powerStationConstructionData.getConstructionComponentInfo());
// powerStationEngineeringInfo.setConstructionInverterInfo(powerStationConstructionData.getConstructionInverterInfo());
// powerStationEngineeringInfo.setConstructionCollectorBoxInfo(powerStationConstructionData.getConstructionCollectorBoxInfo());
// powerStationEngineeringInfo.setConstructionGridBoxInfo(powerStationConstructionData.getConstructionGridBoxInfo());
// powerStationEngineeringInfo.setProjectRegionManager(workOrder.getProjectRegionManager());
// powerStationEngineeringInfo.setProjectRegionManagerPhone(workOrder.getProjectRegionManagerPhone());
// powerStationEngineeringInfo.setConstructionRegionManager(workOrder.getConstructionRegionManager());
// powerStationEngineeringInfo.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
// }
// powerStationEngineeringInfo.setCompletionDate(new Date());
// surveyInfoAllDto.setPowerStationConstructionData(powerStationConstructionData);
// surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);
// return surveyInfoAllDto;
}
@Transactional
public PowerStationEngineeringInfoAllDto addPowerStationEngineeringInfo(PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto){
LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getSequenceNbr,powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
//修改电站状态
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getCode());
workOrderPowerStationMapper.updateById(workOrderPowerStation);
//修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper();
qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId());
List<String> d=new ArrayList<>();
d.add(WorkOrderEnum.施工中.getCode());
d.add(WorkOrderEnum.待施工.getCode());
d.add(WorkOrderEnum.待登记.getCode());
qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d);
List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu1);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
if(list==null&&list.isEmpty()){
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.登记中.getCode());
workOrderMapper.update(null,upq);
}
//新增完工登记
PowerStationEngineeringInfo powerStationEngineeringInfo= powerStationEngineeringInfoAllDto.getPowerStationEngineeringInfo();
powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
powerStationEngineeringInfo.setWorkOrderPowerStationId(powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
powerStationEngineeringInfoMapper.insert(powerStationEngineeringInfo);
return powerStationEngineeringInfoAllDto;
}
} }
\ No newline at end of file
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