From cd3caee2e0de89bc8ae695678d9bb6d1bba018a6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 14 四月 2026 10:58:07 +0800
Subject: [PATCH] 【丽水】出院随访导出
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 31 +++++++++------
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java | 36 ++++++++++++-----
2 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 3559e57..a8e2f3c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.PreachFormEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -40,10 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -214,23 +212,30 @@
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskEntity serviceSubtaskVO) {
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ serviceSubtaskVO.setOrgid(user.getOrgid());
List<ServiceSubtaskRes> serviceSubtaskList = null;
if (serviceSubtaskVO != null) {
- if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null)
- PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
- List<ServiceSubtaskExprot> serviceSubtaskExprots = null;
+ List<ServiceSubtaskExport> serviceSubtaskExports = null;
if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
- serviceSubtaskExprots = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExprot.class);
- for (ServiceSubtaskExprot serviceSubtaskExprot : serviceSubtaskExprots) {
- String pf = PreachFormEnum.getDescByCode(serviceSubtaskExprot.getPreachform());
- serviceSubtaskExprot.setPreachform(pf);
+ serviceSubtaskExports = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExport.class);
+ for (ServiceSubtaskExport serviceSubtaskExport : serviceSubtaskExports) {
+ String pf = PreachFormEnum.getDescByCode(serviceSubtaskExport.getPreachform());
+ serviceSubtaskExport.setPreachform(pf);
+
+ //璁＄畻鍑洪櫌澶╂暟
+ if (!Objects.isNull(serviceSubtaskExport.getEndtime())) {
+ Integer endDay = DateUtils.differentDaysByMillisecond(serviceSubtaskExport.getEndtime(), new Date());
+ serviceSubtaskExport.setEndDay(endDay);
+ }
}
}
- ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
- util.exportExcel(response, serviceSubtaskExprots, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
+ ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
+ util.exportExcel(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
similarity index 74%
rename from smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java
rename to smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
index 5cd4e75..ffd4a0a 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
@@ -8,8 +8,6 @@
import lombok.Data;
import java.util.Date;
-import java.util.List;
-import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級瀵硅薄 ivr_taskcall
@@ -17,9 +15,9 @@
* @author ruoyi
* @date 2024-02-02
*/
-@ApiModel(value = "ServiceSubtaskExprot", description = "鍗曚竴闅忚浠诲姟鍏ュ弬")
+@ApiModel(value = "ServiceSubtaskExport", description = "鍗曚竴闅忚浠诲姟鍏ュ弬")
@Data
-public class ServiceSubtaskExprot extends BaseEntity {
+public class ServiceSubtaskExport extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
@@ -32,21 +30,21 @@
/**
* 鍙戦�佷汉
*/
- @Excel(name = " 鍙戦�佷汉 ")
+ @Excel(name = " 濮撳悕 ")
@ApiModelProperty(value = "鍙戦�佷汉")
private String sendname;
/**
- * 鍒涘缓鑰�
+ * 鍙戦�佺姸鎬�
*/
- @Excel(name = "闅忚浜�")
- private String updateBy;
+ @Excel(name = " 浠诲姟鐘舵�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private Long sendstate;
/**
* 瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
@@ -54,9 +52,16 @@
* 鍑洪櫌鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " 鍑洪櫌鏃ユ湡 ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "鍑洪櫌鏃堕棿")
private Date endtime;
+
+ /**
+ * 搴旈殢璁挎棩鏈�
+ */
+ @Excel(name = "搴旈殢璁挎棩鏈�",dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "搴旈殢璁挎棩鏈�")
+ private Date visitTime;
/**
@@ -66,6 +71,15 @@
@ApiModelProperty(value = "鍖荤敓濮撳悕")
private String drname;
+ /**
+ * 闅忚浜哄憳
+ */
+ @Excel(name = "闅忚浜哄憳")
+ private String updateBy;
+
+ @Excel(name = "鍑洪櫌澶╂暟", suffix = "澶�")
+ @ApiModelProperty(value = "鍑洪櫌澶╂暟")
+ private Integer endDay;
/**
* 韬唤璇佸彿
@@ -117,8 +131,8 @@
/**
* 瀹ｆ暀褰㈠紡 :鏂囨湰銆佸浘鐗囥�佽闊炽�佽棰戙�佹贩鍚�
*/
- @Excel(name = "浠诲姟鎵ц鏂瑰紡")
@ApiModelProperty(value = "浠诲姟褰㈠紡(1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹濆皬绋嬪簭 8.鏅鸿兘鏈哄櫒浜� 9.閽夐拤 10.瀵煎叆)")
+ @Excel(name = "浠诲姟鎵ц鏂瑰紡")
private String preachform;
--
Gitblit v1.9.3