From 8e3a02c1facca35c5a90ce9b49505f373ae658f5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:31:48 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java | 6 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessorganServiceImpl.java | 6 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 6 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganVO.java | 7 ++
ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 29 +++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 104 ++++++++++++++++++++--------------
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml | 3 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 5 +
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 4
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 4 +
12 files changed, 129 insertions(+), 47 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java b/ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java
index 822749e..2fec474 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java
@@ -26,6 +26,7 @@
if (counter == 0) {
// 鍚屼竴姣鍐呰鏁板櫒鐢ㄥ畬锛岀瓑寰呬笅涓�姣
timestamp = waitNextMillis(lastTimestamp);
+ counter = 0L;
}
} else {
counter = 0L;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 3b36f1b..5915a19 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -314,7 +314,11 @@
@Excel(name = "绯荤粺缂栧彿")
private String caseno;
-
+ /**
+ * 鍣ㄥ畼椤哄簭
+ */
+ @ApiModelProperty("鍣ㄥ畼椤哄簭")
+ private Long sort;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganVO.java
index 11e80ac..9ece684 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganVO.java
@@ -292,6 +292,13 @@
private String notgetreason;
/**
+ * 鍣ㄥ畼椤哄簭
+ */
+ @ApiModelProperty("鍣ㄥ畼椤哄簭")
+ private Long sort;
+
+
+ /**
* 绯荤粺缂栧彿
*/
@ApiModelProperty("绯荤粺缂栧彿")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
index a496175..b7c5e1f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
@@ -45,6 +45,12 @@
private String donorno;
/**
+ * 鍣ㄥ畼椤哄簭
+ */
+ @ApiModelProperty("鍣ㄥ畼椤哄簭")
+ private Long sort;
+
+ /**
* 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
*/
@ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
index fd910cc..2524fdd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
@@ -2,8 +2,13 @@
import java.math.BigDecimal;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -13,7 +18,7 @@
/**
* 鎶ラ攢鐢宠鏄庣粏瀵硅薄 service_reimbursementdetail_shared
- *
+ *
* @author ruoyi
* @date 2023-04-20
*/
@@ -32,11 +37,13 @@
/** 璧勯噾鐢宠涓昏〃ID */
@ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
@Excel(name = "璧勯噾鐢宠涓昏〃ID")
+ @TableField("RBID")
private Long rbid;
/** 宸梾鎶ラ攢鍗曟槑缁咺D */
@ApiModelProperty("宸梾鎶ラ攢鍗曟槑缁咺D")
@Excel(name = "宸梾鎶ラ攢鍗曟槑缁咺D")
+ @TableField("RDID")
private Long rdid;
/** 浜哄憳绫诲埆 */
@@ -52,104 +59,124 @@
/** 椤哄簭鍙� */
@ApiModelProperty("椤哄簭鍙�")
@Excel(name = "椤哄簭鍙�")
+ @TableField("OrderNo")
private Long orderno;
/** 鍑哄彂鏃堕棿 */
@ApiModelProperty("鍑哄彂鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @TableField("StartTime")
private Date starttime;
/** 鍑哄彂鍦扮偣 */
@ApiModelProperty("鍑哄彂鍦扮偣")
@Excel(name = "鍑哄彂鍦扮偣")
+ @TableField("Departure")
private String departure;
/** 鍒拌揪鏃堕棿 */
@ApiModelProperty("鍒拌揪鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @TableField("EndTime")
private Date endtime;
/** 鍒拌揪鍦扮偣 */
@ApiModelProperty("鍒拌揪鍦扮偣")
@Excel(name = "鍒拌揪鍦扮偣")
+ @TableField("Destination")
private String destination;
/** 澶╂暟 */
@ApiModelProperty("澶╂暟")
@Excel(name = "澶╂暟")
+ @TableField("Days")
private Long days;
/** 浜ら�氳垂 */
@ApiModelProperty("浜ら�氳垂")
@Excel(name = "浜ら�氳垂")
+ @TableField("TrafficExpense")
private BigDecimal trafficexpense;
/** 浜ら�氬伐鍏� */
@ApiModelProperty("浜ら�氬伐鍏�")
@Excel(name = "浜ら�氬伐鍏�")
+ @TableField("TrafficType")
private String traffictype;
/** 浜ら�氬伐鍏� */
@ApiModelProperty("浜ら�氬伐鍏�")
@Excel(name = "浜ら�氬伐鍏�")
+ @TableField("TrafficType2")
private String traffictype2;
/** 甯傚唴浜ら�氳垂 */
@ApiModelProperty("甯傚唴浜ら�氳垂")
@Excel(name = "甯傚唴浜ら�氳垂")
+ @TableField("CityFee")
private BigDecimal cityfee;
/** 浣忓璐� */
@ApiModelProperty("浣忓璐�")
@Excel(name = "浣忓璐�")
+ @TableField("HotelExpense")
private BigDecimal hotelexpense;
/** 鍙戠エ寮犳暟 */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
+ @TableField("InvoiceCount")
private Long invoicecount;
/** 闄勪欢寮犳暟 */
@ApiModelProperty("闄勪欢寮犳暟")
@Excel(name = "闄勪欢寮犳暟")
+ @TableField("AttachCount")
private Long attachcount;
/** 鏉傝垂 */
@ApiModelProperty("鏉傝垂")
@Excel(name = "鏉傝垂")
+ @TableField("OtherExpense")
private BigDecimal otherexpense;
/** 浼欓璐� */
@ApiModelProperty("浼欓璐�")
@Excel(name = "浼欓璐�")
+ @TableField("FoodExpenses")
private BigDecimal foodexpenses;
/** 浼欓璐硅ˉ鍔� */
@ApiModelProperty("浼欓璐硅ˉ鍔�")
@Excel(name = "浼欓璐硅ˉ鍔�")
+ @TableField("FoodAllowance")
private BigDecimal foodallowance;
/** 闄勪欢琛� */
@ApiModelProperty("闄勪欢琛�")
@Excel(name = "闄勪欢琛�")
+ @TableField(value = "AnnexFiles", updateStrategy = FieldStrategy.IGNORED)
private String annexfiles;
/** 闄勪欢琛� */
@ApiModelProperty("鍙戠エ闄勪欢琛�")
@Excel(name = "鍙戠エ闄勪欢琛�")
+ @TableField(value = "InvoiceFiles", updateStrategy = FieldStrategy.IGNORED)
private String invoicefiles;
/** 涓婁紶鏍囪瘑 */
@ApiModelProperty("涓婁紶鏍囪瘑")
@Excel(name = "涓婁紶鏍囪瘑")
+ @TableField("upload_flag")
private String uploadFlag;
/** 涓婁紶鏃堕棿 */
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @TableField("upload_time")
private Date uploadTime;
/** 鐩殑鍦扮渷浠� */
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
index 1d591d0..10edf5f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
@@ -76,6 +76,7 @@
private String leadername;
private String businessarea;
private String gainHospitalname;
+ private Long sort;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index 525832a..17c560f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -127,6 +127,11 @@
if (serviceDonateorgan.getEstimatedtime() != null) {
wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
}
+ if (serviceDonateorgan.getSort() != null) {
+ wrappers.eq(ServiceDonateorgan::getSort, serviceDonateorgan.getSort());
+ }
+ // 鎸塻ort瀛楁鎺掑簭锛宯ull鍊兼斁鏈�鍚�
+ wrappers.last("ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort ASC");
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessorganServiceImpl.java
index db9643b..459901c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessorganServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper;
import com.ruoyi.project.service.IServiceDonationwitnessorganService;
@@ -81,6 +82,11 @@
if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsdgf())) {
wrappers.eq(ServiceDonationwitnessorgan::getIsdgf, serviceDonationwitnessorgan.getIsdgf());
}
+ if (serviceDonationwitnessorgan.getSort() != null) {
+ wrappers.eq(ServiceDonationwitnessorgan::getSort, serviceDonationwitnessorgan.getSort());
+ }
+ // 鎸塻ort瀛楁鎺掑簭锛宯ull鍊兼斁鏈�鍚�
+ wrappers.last("ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort ASC");
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index df1c025..a053db7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -78,6 +78,9 @@
IServiceReimbursementpayeeSharedService payeeSharedService;
@Autowired
+ IServiceReimbursementpayeeService payeeService;
+
+ @Autowired
IServiceFundflowruleService serviceFundflowruleService;
@Autowired
@@ -210,7 +213,17 @@
List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
log.info("serviceReimbursementShareds鐨勬煡璇㈢粨鏋� :{}", serviceReimbursementShareds.size());
if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {
- return true;
+ //濡傛灉涓嶄负绌猴紝鍒欏皢鍒嗕韩琛ㄩ噷鐨勬暟鎹垹闄わ紙鍥犱负鎺ヤ笅鍘伙紝鑰佹暟鎹笂浼犵殑闄勪欢锛屽彲鑳戒笉鏄兂瑕佺殑浜嗭紝杩樼敤鑰侀檮浠讹紝鏄湁闂鐨勶紱鎵�浠ラ渶瑕佸皢鑰佺殑share鏁版嵁鍒犻櫎锛岀劧鍚庡啀鏂板锛屼笂浼犳柊闄勪欢锛�
+ for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
+ sharedService.removeById(serviceReimbursementShared.getId());
+
+ ServiceReimbursementdetailShared srds = new ServiceReimbursementdetailShared();
+ srds.setRbid(serviceReimbursementShared.getId());
+ List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = detailSharedService.queryList(srds);
+ for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
+ detailSharedService.removeById(serviceReimbursementdetailShared.getId());
+ }
+ }
}
//濡傛灉娌℃湁鎻掑叆锛屽垯璧颁笅闈㈢殑娴佺▼
@@ -234,7 +247,7 @@
// //涓婁紶OA鏂囦欢
//灏唖erviceReimbursementdetail琛ㄩ噷鐨刬d璧嬪�肩粰Rdid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementdetailShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
for (int i = 0; i < details.size(); i++) {
- serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId());
+ serviceReimbursementdetailShareds.get(i).setRdid(details.get(i).getId());
serviceReimbursementdetailShareds.get(i).setRbid(serviceReimbursementShared.getId());
serviceReimbursementdetailShareds.get(i).setId(null);
//涓婁紶OA鏂囦欢
@@ -257,7 +270,16 @@
// detailSharedService.saveBatch(serviceReimbursementdetailShareds);
for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
if (ObjectUtils.isNotEmpty(serviceReimbursementdetailShared)) {
+ log.info("鏇存柊serviceReimbursementdetail琛ㄩ噷鐨勫�间负:{}", serviceReimbursementdetailShared);
detailSharedService.save(serviceReimbursementdetailShared);
+
+ log.info("鏇存柊serviceReimbursementdetail琛ㄩ噷鐨勯檮浠跺瓧娈�:{},{}", serviceReimbursementdetailShared.getAnnexfiles(), serviceReimbursementdetailShared.getInvoicefiles());
+ //鏇存柊serviceReimbursementdetail琛ㄩ噷鐨勯檮浠跺瓧娈�
+ ServiceReimbursementdetail serviceReimbursementdetail = new ServiceReimbursementdetail();
+ serviceReimbursementdetail.setId(serviceReimbursementdetailShared.getRdid());
+ serviceReimbursementdetail.setAnnexfiles(serviceReimbursementdetailShared.getAnnexfiles());
+ serviceReimbursementdetail.setInvoicefiles(serviceReimbursementdetailShared.getInvoicefiles());
+ serviceReimbursementdetailMapper.updateById(serviceReimbursementdetail);
} else {
log.info("serviceReimbursementdetailShared涓虹┖浜�");
}
@@ -551,18 +573,15 @@
addSharedData(serviceReimbursement.getId());
List<ServiceReimbursementShared> serviceReimbursementSharedList = sharedService.getRemShareInfoByRemId(serviceReimbursement.getId());
if (org.springframework.util.CollectionUtils.isEmpty(serviceReimbursementSharedList)) return false;
-
log.info("serviceReimbursementSharedList鐨勬暟鎹噺涓猴細{}", serviceReimbursementSharedList.size());
//detail璇︽儏
- ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
- serviceReimbursementdetailShared.setRbid(serviceReimbursementSharedList.get(0).getId());
- List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = detailSharedService.queryList(serviceReimbursementdetailShared);
+ List<ServiceReimbursementdetail> serviceReimbursementdetailList = serviceReimbursementdetailMapper.getAllDetailsByRBID(serviceReimbursement.getId());
//payee璇︽儏
- ServiceReimbursementpayeeShared serviceReimbursementpayeeShared = new ServiceReimbursementpayeeShared();
- serviceReimbursementpayeeShared.setRbid(serviceReimbursementSharedList.get(0).getId());
- List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = payeeSharedService.queryList(serviceReimbursementpayeeShared);
+ ServiceReimbursementpayee serviceReimbursementpayee = new ServiceReimbursementpayee();
+ serviceReimbursementpayee.setRbid(serviceReimbursement.getId());
+ List<ServiceReimbursementpayee> serviceReimbursementpayees = payeeService.queryList(serviceReimbursementpayee);
// 鏁版嵁鐨勫皝瑁�
@@ -576,10 +595,10 @@
ServiceReimbursement sr = serviceReimbursementMapper.selectById(serviceReimbursement.getId());
data2.put("formmain_1209", formmain_1209(sr));
// 鏄庣粏琛ㄥ瓧娈垫暟鎹紝涓庨檮浠剁殑澶勭悊
- Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailShareds);
+ Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailList);
data2.put("formson_1210", map1.get("formson_1210"));
data2.put("thirdAttachments", map1.get("annexfilesList"));
- data2.put("formson_1211", formson_1211(serviceReimbursementpayeeShareds));
+ data2.put("formson_1211", formson_1211(serviceReimbursementpayees));
data.put("data", data2);
//妯℃澘缂栧彿锛岀敱鑷磋繙鏂规彁渚涳紝璇ュ弬鏁板喅瀹氬彂璧峰崗鍚岀郴缁熶腑鍝釜娴佺▼
data.put("templateCode", "cyfbxd_rzhc_ceshi");
@@ -635,36 +654,36 @@
return true;
}
- private Map<String, List<Map<String, Object>>> formson_1210(List<ServiceReimbursementdetailShared> serviceReimbursementdetailSharedList) {
+ private Map<String, List<Map<String, Object>>> formson_1210(List<ServiceReimbursementdetail> serviceReimbursementdetailList) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> annexfilesList = new ArrayList<>();
- for (ServiceReimbursementdetailShared reimbursementdetailShared : serviceReimbursementdetailSharedList) {
+ for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetailList) {
Map<String, Object> map = new HashMap<>();
- map.put("浜ら�氬伐鍏�", reimbursementdetailShared.getTraffictype());
- map.put("浜ら�氳垂", reimbursementdetailShared.getTrafficexpense());
- map.put("甯傚唴浜ら��", reimbursementdetailShared.getCityfee());
- map.put("浣忓璐�", reimbursementdetailShared.getHotelexpense());
- map.put("鏉傝垂", reimbursementdetailShared.getOtherexpense());
- map.put("浼欓璐规姤閿�", reimbursementdetailShared.getFoodexpenses());
- map.put("浼欓璐硅ˉ鍔�", reimbursementdetailShared.getFoodallowance());
- map.put("鍏朵粬璐圭敤", reimbursementdetailShared.getOtherfeeamount());
- map.put("鍏朵粬璐圭敤璇存槑", reimbursementdetailShared.getOtherfeedesc());
+ map.put("浜ら�氬伐鍏�", reimbursementdetail.getTraffictype());
+ map.put("浜ら�氳垂", reimbursementdetail.getTrafficexpense());
+ map.put("甯傚唴浜ら��", reimbursementdetail.getCityfee());
+ map.put("浣忓璐�", reimbursementdetail.getHotelexpense());
+ map.put("鏉傝垂", reimbursementdetail.getOtherexpense());
+ map.put("浼欓璐规姤閿�", reimbursementdetail.getFoodexpenses());
+ map.put("浼欓璐硅ˉ鍔�", reimbursementdetail.getFoodallowance());
+ map.put("鍏朵粬璐圭敤", reimbursementdetail.getOtherfeeamount());
+ map.put("鍏朵粬璐圭敤璇存槑", reimbursementdetail.getOtherfeedesc());
map.put("閲戦鍚堣", "");
- map.put("鍑哄樊鏃堕棿璧�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getStarttime()));
- map.put("鍑哄彂鍦扮偣", reimbursementdetailShared.getDeparture());
- map.put("鍑哄樊鏃堕棿姝�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getEndtime()));
- map.put("鍑哄樊鐩殑鍦�", reimbursementdetailShared.getDestination());
- map.put("澶╂暟", reimbursementdetailShared.getDays());
- BigDecimal total = safe(reimbursementdetailShared.getCityfee()).add(safe(reimbursementdetailShared.getTrafficexpense())).add(safe(reimbursementdetailShared.getHotelexpense())).add(safe(reimbursementdetailShared.getOtherexpense())).add(safe(reimbursementdetailShared.getFoodexpenses())).add(safe(reimbursementdetailShared.getFoodallowance())).add(safe(reimbursementdetailShared.getOtherfeeamount()));
+ map.put("鍑哄樊鏃堕棿璧�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetail.getStarttime()));
+ map.put("鍑哄彂鍦扮偣", reimbursementdetail.getDeparture());
+ map.put("鍑哄樊鏃堕棿姝�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetail.getEndtime()));
+ map.put("鍑哄樊鐩殑鍦�", reimbursementdetail.getDestination());
+ map.put("澶╂暟", reimbursementdetail.getDays());
+ BigDecimal total = safe(reimbursementdetail.getCityfee()).add(safe(reimbursementdetail.getTrafficexpense())).add(safe(reimbursementdetail.getHotelexpense())).add(safe(reimbursementdetail.getOtherexpense())).add(safe(reimbursementdetail.getFoodexpenses())).add(safe(reimbursementdetail.getFoodallowance())).add(safe(reimbursementdetail.getOtherfeeamount()));
map.put("瀹為檯鎶ラ攢閲戦", total);
- map.put("璐㈠姟澶囨敞", reimbursementdetailShared.getRemark());
- map.put("id", reimbursementdetailShared.getRdid());
- map.put("鍑哄樊浜�", reimbursementdetailShared.getPersonname());
+ map.put("璐㈠姟澶囨敞", reimbursementdetail.getRemark());
+ map.put("id", reimbursementdetail.getId());
+ map.put("鍑哄樊浜�", reimbursementdetail.getPersonname());
map.put("鍥炰氦閫氬伐鍏�", "");
- map.put("浜哄憳绫诲埆", reimbursementdetailShared.getPersontype());
+ map.put("浜哄憳绫诲埆", reimbursementdetail.getPersontype());
map.put("浣忓璐规爣鍑�", "");
- map.put("浣忓璐规爣鍑嗗悎璁�", reimbursementdetailShared.getHotelexpense());
+ map.put("浣忓璐规爣鍑嗗悎璁�", reimbursementdetail.getHotelexpense());
Long fpuuid = IdGeneratorUtils.nextId();
map.put("鍙戠エ闄勪欢", fpuuid);
map.put("绁ㄦ嵁璇嗗埆", "");
@@ -678,8 +697,8 @@
list.add(map);
//闄勪欢澶勭悊
- String annexfiles = reimbursementdetailShared.getAnnexfiles();
- String invoicefiles = reimbursementdetailShared.getInvoicefiles();
+ String annexfiles = reimbursementdetail.getAnnexfiles();
+ String invoicefiles = reimbursementdetail.getInvoicefiles();
int i = 0;
if (StringUtils.isNotEmpty(annexfiles)) {
@@ -714,18 +733,18 @@
return val == null ? BigDecimal.ZERO : val;
}
- private List<Map<String, Object>> formson_1211(List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds) {
+ private List<Map<String, Object>> formson_1211(List<ServiceReimbursementpayee> serviceReimbursementpayees) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<>();
- for (ServiceReimbursementpayeeShared serviceReimbursementpayeeShared : serviceReimbursementpayeeShareds) {
+ for (ServiceReimbursementpayee serviceReimbursementpayee : serviceReimbursementpayees) {
Map<String, Object> map = new HashMap<>();
- map.put("鏀舵浜�", serviceReimbursementpayeeShared.getPersonname());
- map.put("鍗″彿", serviceReimbursementpayeeShared.getBankcardno());
- map.put("寮�鎴烽摱琛�", serviceReimbursementpayeeShared.getBankname());
- map.put("鎵撴閲戦", serviceReimbursementpayeeShared.getAmount());
- map.put("浜哄憳绫诲埆鎵撴", serviceReimbursementpayeeShared.getPersontype());
+ map.put("鏀舵浜�", serviceReimbursementpayee.getPersonname());
+ map.put("鍗″彿", serviceReimbursementpayee.getBankcardno());
+ map.put("寮�鎴烽摱琛�", serviceReimbursementpayee.getBankname());
+ map.put("鎵撴閲戦", serviceReimbursementpayee.getAmount());
+ map.put("浜哄憳绫诲埆鎵撴", serviceReimbursementpayee.getPersontype());
map.put("鏍哥畻椤圭洰", "");
map.put("棰勭畻椤圭洰", "");
map.put("鍊熸柟鎽樿", "");
@@ -808,7 +827,6 @@
public int uploadOAFileAndUpdateDb(ServiceReimbursementdetailShared remShare) throws Exception {
log.info("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:{}", remShare);
- System.out.println("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:" + remShare);
//涓婁紶OA鏂囦欢
String strRes = getToken();
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index e7c7910..b7325ee 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -70,6 +70,7 @@
<result property="organchargedesc" column="organchargedesc"/>
<result property="notgetreason" column="notgetreason"/>
<result property="transplantstate" column="transplantstate"/>
+ <result property="sort" column="sort"/>
</resultMap>
<sql id="selectServiceDonateorganVo">
@@ -77,6 +78,7 @@
InfoID,
DonorNo,
OrganNo,
+ sort,
OrganName,
OrganState,
OrganNumber,
@@ -149,6 +151,7 @@
<include refid="selectServiceDonateorganVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="sort != null ">and sort = #{sort}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -412,6 +415,7 @@
`service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
`service_donatebaseinfo`.`RecordState` AS `RecordState`,
`service_donateorgan`.`ID` AS `doID`,
+ `service_donateorgan`.`sort` AS `sort`,
`service_donateorgan`.`InfoID` AS `InfoID`,
`service_donateorgan`.`DonorNo` AS `doDonorNo`,
`service_donateorgan`.`OrganNo` AS `OrganNo`,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
index 08e72e9..6c7e370 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -29,12 +29,14 @@
<result property="updateTime" column="update_time"/>
<result property="name" column="name"/>
<result property="caseno" column="caseno"/>
+ <result property="sort" column="sort"/>
<result property="organStartTime" column="organ_start_time"/>
</resultMap>
<sql id="selectServiceDonationwitnessorganVo">
select ID,
InfoID,
+ sort,
DonorNo,
organ_start_time,
OrganNo,
@@ -68,6 +70,7 @@
<include refid="selectServiceDonationwitnessorganVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="sort != null ">and sort = #{sort}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 98d50f6..c7bb2a3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
@@ -56,7 +56,7 @@
<if test="rbid != null and rbid != ''"> and RBID = #{rbid}</if>
</where>
</select>
- <select id="getRBDetailList" resultType="com.ruoyi.project.domain.ServiceReimbursementdetail">
+ <select id="getRBDetailList" resultMap="ServiceReimbursementdetailResult">
<include refid="selectServiceReimbursementdetailVo"/>
where RBID = #{id} and del_flag = 0
order by OrderNo
@@ -65,7 +65,7 @@
select ID from service_reimbursementdetail
where RBID = #{rbid}
</select>
- <select id="getAllDetailsByRBID" resultType="com.ruoyi.project.domain.ServiceReimbursementdetail">
+ <select id="getAllDetailsByRBID" resultMap="ServiceReimbursementdetailResult">
<include refid="selectServiceReimbursementdetailVo"/>
where RBID = #{id} and del_flag = 0 order by OrderNo
</select>
--
Gitblit v1.9.3