From a196fc3cf85ac2bb993a4d185ae9c3a255e9fa6a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 28 Nov 2023 15:20:48 +0800
Subject: [PATCH] 水库填报修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java | 31 +++++++--------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java | 21 ++++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java | 17 +++-----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java | 15 +++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java | 7 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java | 8 +++
7 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
index 3ba81c1..cb42047 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
@@ -1,9 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -46,42 +43,42 @@
* 管理单位名称
*/
@ApiModelProperty(value = "管理单位名称")
- @TableField("\"m_unit_name\"")
+ @TableField(value = "\"m_unit_name\"",fill = FieldFill.UPDATE)
private String mUnitName;
/**
* 主管部门名称
*/
@ApiModelProperty(value = "主管部门名称")
- @TableField("\"c_unit_name\"")
+ @TableField(value = "\"c_unit_name\"",fill = FieldFill.UPDATE)
private String cUnitName;
/**
* 管理单位性质
*/
@ApiModelProperty(value = "管理单位性质")
- @TableField("\"m_unit_nature\"")
+ @TableField(value = "\"m_unit_nature\"",fill = FieldFill.UPDATE)
private String mUnitNature;
/**
* 管理单位职工人数
*/
@ApiModelProperty(value = "管理单位职工人数")
- @TableField("\"m_unit_person_number\"")
+ @TableField(value = "\"m_unit_person_number\"",fill = FieldFill.UPDATE)
private Integer mUnitPersonNumber;
/**
* 人员经费来源
*/
@ApiModelProperty(value = "人员经费来源")
- @TableField("\"person_economic_source\"")
+ @TableField(value = "\"person_economic_source\"",fill = FieldFill.UPDATE)
private String personEconomicSource;
/**
* 维修养护经费来源
*/
@ApiModelProperty(value = "维修养护经费来源 ")
- @TableField("\"maintenance_economic_source\"")
+ @TableField(value = "\"maintenance_economic_source\"",fill = FieldFill.UPDATE)
private String maintenanceEconomicSource;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
index f986edf..4fbcfc3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
@@ -1,9 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -46,35 +43,35 @@
* 名称
*/
@ApiModelProperty(value = "名称")
- @TableField("\"name\"")
+ @TableField(value = "\"name\"",fill = FieldFill.UPDATE)
private String name;
/**
* 数量
*/
@ApiModelProperty(value = "数量")
- @TableField("\"num\"")
+ @TableField(value = "\"num\"",fill = FieldFill.UPDATE)
private Integer num;
/**
* 厂房布置型式
*/
@ApiModelProperty(value = "厂房布置型式")
- @TableField("\"plant_layout_type\"")
+ @TableField(value = "\"plant_layout_type\"",fill = FieldFill.UPDATE)
private Integer plantLayoutType;
/**
* 装机容量
*/
@ApiModelProperty(value = "装机容量")
- @TableField("\"installed_capacity\"")
+ @TableField(value = "\"installed_capacity\"",fill = FieldFill.UPDATE)
private Integer installedCapacity;
/**
* 平均年利用小时
*/
@ApiModelProperty(value = "平均年利用小时")
- @TableField("\"year_avg_hour\"")
+ @TableField(value = "\"year_avg_hour\"",fill = FieldFill.UPDATE)
private Integer yearAvgHour;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
index 0e22fb7..a71e5a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
@@ -1,9 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -46,14 +43,14 @@
* 水库最高水位
*/
@ApiModelProperty(value = "水库最高水位")
- @TableField("\"res_max_stag\"")
+ @TableField(value = "\"res_max_stag\"",fill = FieldFill.UPDATE)
private Double resMaxStag;
/**
* 最高水位发生日期
*/
@ApiModelProperty(value = "最高水位发生日期")
- @TableField("\"res_max_stag_date\"")
+ @TableField(value = "\"res_max_stag_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxStagDate;
@@ -62,14 +59,14 @@
* 水库最低水位
*/
@ApiModelProperty(value = "水库最低水位")
- @TableField("\"res_min_stag\"")
+ @TableField(value = "\"res_min_stag\"",fill = FieldFill.UPDATE)
private Double resMinStag;
/**
* 最低水位发生日期
*/
@ApiModelProperty(value = "最低水位发生日期")
- @TableField("\"res_min_stag_date\"")
+ @TableField(value = "\"res_min_stag_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMinStagDate;
@@ -78,14 +75,14 @@
* 水库最大入库流量
*/
@ApiModelProperty(value = "水库最大入库流量")
- @TableField("\"res_max_in_flow\"")
+ @TableField(value = "\"res_max_in_flow\"",fill = FieldFill.UPDATE)
private Double resMaxInFlow;
/**
* 水库最大入库流量发生日期
*/
@ApiModelProperty(value = "水库最大入库流量发生日期 ")
- @TableField("\"res_max_in_flow_date\"")
+ @TableField(value = "\"res_max_in_flow_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxInFlowDate;
@@ -94,14 +91,14 @@
* 水库最大出库流量
*/
@ApiModelProperty(value = "水库最大出库流量")
- @TableField("\"res_max_out_flow\"")
+ @TableField(value = "\"res_max_out_flow\"",fill = FieldFill.UPDATE)
private Double resMaxOutFlow;
/**
* 水库最大出库流量发生日期
*/
@ApiModelProperty(value = "水库最大出库流量发生日期 ")
- @TableField("\"res_max_out_flow_date\"")
+ @TableField(value = "\"res_max_out_flow_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxOutFlowDate;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
index 00fe311..3815aec 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
@@ -1,9 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -39,14 +36,14 @@
* 名称
*/
@ApiModelProperty(value = "名称")
- @TableField("\"name\"")
+ @TableField(value = "\"name\"",fill = FieldFill.UPDATE)
private String name;
/**
* 数量
*/
@ApiModelProperty(value = "数量")
- @TableField("\"num\"")
+ @TableField(value = "\"num\"",fill = FieldFill.UPDATE)
private Integer num;
/**
@@ -60,77 +57,77 @@
* 输水道型式
*/
@ApiModelProperty(value = "输水道型式")
- @TableField("\"aqueduct_type\"")
+ @TableField(value = "\"aqueduct_type\"",fill = FieldFill.UPDATE)
private String aqueductType;
/**
* 输水道长度
*/
@ApiModelProperty(value = "输水道长度")
- @TableField("\"aqueduct_length\"")
+ @TableField(value = "\"aqueduct_length\"",fill = FieldFill.UPDATE)
private Double aqueductLength;
/**
* 进口底槛高程
*/
@ApiModelProperty(value = "进口底槛高程")
- @TableField("\"threshold_elevation\"")
+ @TableField(value = "\"threshold_elevation\"",fill = FieldFill.UPDATE)
private Double thresholdElevation;
/**
* 出口底槛高程
*/
@ApiModelProperty(value = "出口底槛高程")
- @TableField("\"export_elevation\"")
+ @TableField(value = "\"export_elevation\"",fill = FieldFill.UPDATE)
private Double exportElevation;
/**
* 断面尺寸/面积
*/
@ApiModelProperty(value = "断面尺寸/面积")
- @TableField("\"section_wide\"")
+ @TableField(value = "\"section_wide\"",fill = FieldFill.UPDATE)
private Double sectionWide;
/**
* 断面尺寸/高
*/
@ApiModelProperty(value = "断面尺寸/高")
- @TableField("\"section_high\"")
+ @TableField(value = "\"section_high\"",fill = FieldFill.UPDATE)
private Double sectionHigh;
/**
* 设计流量
*/
@ApiModelProperty(value = "设计流量 ")
- @TableField("\"design_flow\"")
+ @TableField(value = "\"design_flow\"",fill = FieldFill.UPDATE)
private Double designFlow;
/**
* 工作闸门型式
*/
@ApiModelProperty(value = "工作闸门型式 ")
- @TableField("\"working_gate_type\"")
+ @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
private String workingGateType;
/**
* 启闭方式
*/
@ApiModelProperty(value = "启闭方式 ")
- @TableField("\"oc_type\"")
+ @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
private String ocType;
/**
* 启闭动力
*/
@ApiModelProperty(value = "启闭动力")
- @TableField("\"oc_power\"")
+ @TableField(value = "\"oc_power\"",fill = FieldFill.UPDATE)
private String ocPower;
/**
* 输水道是否穿过坝体
*/
@ApiModelProperty(value = "输水道是否穿过坝体")
- @TableField("\"is_across_dam_body\"")
+ @TableField(value = "\"is_across_dam_body\"",fill = FieldFill.UPDATE)
private String isAcrossDamBody;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java
index 6f00aa4..f30901c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResMgrSysBServiceImpl.java
@@ -93,8 +93,11 @@
if (tbAttResMgrSysB.getCheckState()==3){
tbAttResMgrSysB.setCheckState(0);
}
+
+ detail.setCheckState(tbAttResMgrSysB.getCheckState());
+
// 更新数据
- int i = baseMapper.updateById(tbAttResMgrSysB);
+ int i = baseMapper.updateById(detail);
if (i>0){
if (!edit) {
tbAttResBaseService.updateFinalState(tbAttResMgrSysB.getResGuid(), tbAttResMgrSysB.getCheckState());
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
index d8ab829..caf9237 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
@@ -136,8 +136,13 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
+ // 取旧数据和新提交数据交集--更新
+ List<TbAttResPowerStation> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+
// 更新数据
- boolean batch = updateBatchById(newList);
+ boolean batch = updateBatchById(updateList);
if (batch){
if (!edit) {
tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
index 2648f73..74004cb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
@@ -133,8 +133,14 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
+ // 取旧数据和新提交数据交集--更新
+ List<TbAttResWaterDelivery> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+
// 更新数据
- boolean batch = updateBatchById(newList);
+ boolean batch = updateBatchById(updateList);
+
if (batch){
if (!edit) {
tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
--
Gitblit v1.9.3