From e48045eb2bff36977334a235bb449daa1424601c Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Tue, 16 Jul 2024 14:13:26 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/kening/vordm/entity/DisasterInfo.java | 1 -
.../controller/DisasterInfoController.java | 1 -
.../vordm/mapper/DisasterInfoMapper.xml | 4 +-
.../impl/EntityDataAllServiceImpl.java | 49 +++++++++++--------
4 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
index a7c739b..0acffc8 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
@@ -228,7 +228,6 @@ public class DisasterInfo implements Serializable {
private String email;
//分数
- @TableField(exist = false)
private Integer fraction;
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index 8326d47..b24104c 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -782,7 +782,6 @@ public class DisasterInfoController {
}
byId.setFraction(fractionUserNew);
administratorService.updateById(byId);
-
}else {
userEmail = disasterInfo.getEmail();
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 9e3db7f..480037f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -25,6 +25,7 @@
+
@@ -36,7 +37,7 @@
di.temp_start_time,di.create_time,di.vordm_id,
di.respond_time,di.download_count,di.sponsor_organization,
di.responded_time,di.is_end_apply,di.admin_id,di.admin_name,
- di.chief_id,di.chief_name,di.approval_role
+ di.chief_id,di.chief_name,di.approval_role,di.fraction
@@ -191,6 +192,7 @@
d.respond_status,
d.responded_time,
d.is_end_apply,
+ d.fraction,
ud.review_time AS reviewTime,
ud.sponsor_id AS sponsorId,
bdb.dict_value as dictValue,
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java
index 133d290..5328524 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java
@@ -118,6 +118,8 @@ public class EntityDataAllServiceImpl extends ServiceImpl {
if (!Objects.isNull(cell)){
int columnIndex = cell.getColumnIndex();
+ //设置单元格类型
+ cell.setCellType(CellType.STRING);
switch (columnIndex) {
case 0:
entityDataAll.setTitle(cell.getStringCellValue());
@@ -132,56 +134,62 @@ public class EntityDataAllServiceImpl extends ServiceImpl