From 5b6bd2b10c8c87b658b888f4d0384aec3ed491ce Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 26 八月 2025 12:21:29 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/ThirdLoginBody.java | 23 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementSharedMapper.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceCodeAndPyaWay.java | 60 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 46 ++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 221 +++++++++------
ruoyi-admin/src/main/resources/application.yml | 8
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessVO.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml | 17 +
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 10
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessDocVO.java | 44 +++
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 3
ruoyi-admin/src/main/resources/application-druid.yml | 6
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 11
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/batchFundTax.puml | 146 ++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 177 +++++++++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FundVO.java | 1
22 files changed, 628 insertions(+), 169 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 94b2a5e..2c26721 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -59,11 +59,12 @@
@Autowired
private IServiceFundService serviceFundService;
@Autowired
+ private IServiceFundSharedService serviceFundSharedService;
+ @Autowired
private IServiceFunddetailService serviceFunddetailService;
@Autowired
private IServiceFundflowruleService serviceFundflowruleService;
- @Autowired
- private IServiceFundflowService serviceFundflowService;
+
@Autowired
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
@@ -71,20 +72,10 @@
private IServiceReimbursementService serviceReimbursementService;
@Autowired
- private IServiceSystemmessageService iServiceSystemmessageService;
-
- @Autowired
private IServiceExternalpersonService externalpersonService;
@Autowired
private ISysPostService postService;
-
-
- @Autowired
- private DingTalkService dingTalkService;
-
- @Autowired
- private ISysUserService sysUserService;
public ServiceFundController() {
configuration = new Configuration();
@@ -118,13 +109,32 @@
@PostMapping("/processlog")
public AjaxResult processlog(@RequestBody ServiceProcessVO serviceProcessVO) {
log.info("鑷磋繙绯荤粺娴佺▼閫�鍥炲鎵规棩蹇楀叆鍙傦細{}", serviceProcessVO);
- if (serviceProcessVO.getBackCode() == null || StringUtils.isEmpty(serviceProcessVO.getApplytype())) {
+ if (serviceProcessVO.getBackCode() == null && StringUtils.isEmpty(serviceProcessVO.getApplytype())) {
return AjaxResult.error("鍏ヨ兘涓虹┖,璇锋鏌ュ叆鍙�!!");
}
Boolean processlog = serviceFundService.processlog(serviceProcessVO);
if (!processlog) return AjaxResult.error("瀹℃壒璁板綍澶辫触");
return AjaxResult.success("瀹℃壒璁板綍鎴愬姛");
+ }
+
+ /**
+ * 淇敼缂栧彿涓庢敮浠樻柟寮�
+ *
+ * @param serviceCodeAndPyaWay
+ * @return
+ */
+ @PostMapping("/updatecodepayway")
+ public AjaxResult updatecodepay(@RequestBody ServiceCodeAndPyaWay serviceCodeAndPyaWay) {
+ log.info("鑷磋繙绯荤粺缂栧彿涓庢敮浠樻柟寮忓叆鍙傦細{}", serviceCodeAndPyaWay);
+ if (StringUtils.isEmpty(serviceCodeAndPyaWay.getApplytype()) || StringUtils.isEmpty(serviceCodeAndPyaWay.getBh()) || StringUtils.isEmpty(serviceCodeAndPyaWay.getZffs())) {
+ return AjaxResult.error("鍏ヨ兘涓虹┖,璇锋鏌ュ叆鍙�!!");
+ }
+
+ Boolean result = serviceFundService.updatecodepay(serviceCodeAndPyaWay);
+ if (!result) return AjaxResult.error("淇敼澶辫触");
+
+ return AjaxResult.success("淇敼鎴愬姛");
}
@@ -323,7 +333,7 @@
public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
log.info("serviceFundController---checkFund鐨勫叆鍙傚�糲heckFundVO :{}", checkFundVO);
LoginUser loginUser = getLoginUser();
- Map<String, String> map = serviceFundService.checkFund(checkFundVO,loginUser);
+ Map<String, String> map = serviceFundService.checkFund(checkFundVO, loginUser);
Set<String> keys = map.keySet();
for (String s : keys) {
if (!s.equals("200")) return AjaxResult.error(map.get(s));
@@ -454,9 +464,13 @@
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_" + dataMap.get("XM") + "_" + newTime;
+ String newName = null;
+ if (Objects.isNull(dataMap.get("XM"))) {
+ newName = dataMap.get("XM").toString().trim();
+ }
+ String name = "涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_" + newName + "_" + newTime;
if (dataLW.equals("4")) {
- name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ name = "鍔炲叕璐圭敤鐢宠鍗昣" + newName + "_" + newTime;
}
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/batchFundTax.puml b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/batchFundTax.puml
new file mode 100644
index 0000000..4cb92c8
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/batchFundTax.puml
@@ -0,0 +1,146 @@
+@startuml
+!theme plain
+skinparam backgroundColor white
+skinparam defaultFontName Microsoft YaHei
+
+title /batchFundTax 涓氬姟閫昏緫娴佺▼鍥�
+
+start
+
+:鐢ㄦ埛璋冪敤 /batchFundTax 鎺ュ彛;
+:浼犲叆 FundTaxVO 鍙傛暟;
+
+if (fundTaxId 鏄惁涓虹┖?) then (鏄�)
+ :鎶涘嚭寮傚父: "鍒嗘壒绠楃◣鍑洪棶棰樹簡,璇锋鏌ュ悗鍐嶈繘琛岃绠�";
+ stop
+else (鍚�)
+ if (addOrupdate == 1?) then (鏄�)
+ :鑾峰彇鏈�澶� fundTaxId;
+ note right: SQL: SELECT MAX(id) FROM service_fundtax;
+ if (褰撳墠 fundTaxId != 鏈�澶� fundTaxId?) then (鏄�)
+ :鎶涘嚭寮傚父: "璇ユ壒鏁版嵁涓嶈兘绠楃◣";
+ stop
+ else (鍚�)
+ :缁х画鎵ц;
+ endif
+ else (鍚�)
+ :缁х画鎵ц;
+ endif
+endif
+
+:鏍规嵁 fundTaxId 鏌ヨ鎵�鏈� ServiceFund 璁板綍;
+note right: SQL: SELECT * FROM service_fund WHERE fund_tax_id = #{fundTaxId} AND del_flag = 0;
+:閬嶅巻姣忎釜 ServiceFund;
+
+while (杩樻湁 ServiceFund 鏈鐞�?) is (鏄�)
+ :鑾峰彇褰撳墠 ServiceFund 鐨� fundid;
+ :鏍规嵁 fundid 鏌ヨ鎵�鏈� ServiceFunddetail;
+ note right: SQL: SELECT * FROM service_funddetail WHERE fundid = #{fundid};
+
+ while (杩樻湁 ServiceFunddetail 鏈鐞�?) is (鏄�)
+ :鑾峰彇褰撳墠 ServiceFunddetail;
+
+ if (韬唤璇佸彿鏄惁涓虹┖?) then (鏄�)
+ if (servicesscopename 鍖呭惈"绋庡悗"?) then (鏄�)
+ :璁剧疆 amount = taxedamount;
+ else (鍚�)
+ :璁剧疆 taxedamount = amount;
+ endif
+ :璁剧疆 taxamount = 0;
+ :鏇存柊鏁版嵁搴�;
+ note right: SQL: UPDATE service_funddetail SET amount=#{amount}, taxedamount=#{taxedamount}, taxamount=0 WHERE id=#{id};
+ :绱姞 pretaxcost 鍜� taxedcost;
+ else (鍚�)
+ :鑾峰彇褰撴湀绗竴澶�;
+ :鏌ヨ璇ヨ韩浠借瘉鍙锋湰鏈堟渶澶у簭鍙�;
+ note right: SQL: SELECT MAX(xh) FROM service_funddetail WHERE idcardno = #{idcardno} AND tax_time >= #{firstDay} AND tax_time <= #{taxTime};
+ :璁剧疆搴忓彿;
+
+ :鏌ヨ璇ヨ韩浠借瘉鍙锋湰鏈堢疮璁＄◣鍓嶃�佺◣閲戙�佺◣鍚�;
+ note right: SQL: SELECT SUM(amount) as amounts, SUM(taxamount) as taxAmounts, SUM(taxedamount) as taxedAmounts FROM service_funddetail a LEFT JOIN service_fund b ON a.fundid = b.id WHERE a.idcardno = #{idcardno} AND a.tax_time >= #{firstDay} AND a.tax_time <= #{taxTime} AND a.xh < #{xh} AND b.fundtaxtime <= #{fundtaxtime};
+
+ if (temporarySave 涓湁鐩稿悓韬唤璇佸彿?) then (鏄�)
+ :绱姞涓存椂淇濆瓨鐨勬暟鎹埌 taxSum;
+ endif
+
+ if (servicesscopename 鍖呭惈"绋庡悗"?) then (鏄�)
+ :绋庡悗绠楃◣閫昏緫;
+ :璁＄畻鏈绋庡墠閲戦;
+ :璁＄畻鏈绋庨噾;
+ else (鍚�)
+ :绋庡墠绠楃◣閫昏緫;
+ :璁＄畻鏈绋庨噾;
+ :璁＄畻鏈绋庡悗閲戦;
+ endif
+
+ :璁剧疆绠楃◣鏃堕棿;
+ :鏇存柊鏁版嵁搴�;
+ note right: SQL: UPDATE service_funddetail SET amount=#{amount}, taxamount=#{taxamount}, taxedamount=#{taxedamount}, tax_time=#{taxTime}, xh=#{xh} WHERE id=#{id};
+ :绱姞 pretaxcost 鍜� taxedcost;
+ :娣诲姞鍒� temporarySave;
+ endif
+ endwhile (鍚�)
+endwhile (鍚�)
+
+:鏇存柊 ServiceFund 琛�;
+note right: SQL: UPDATE service_fund SET pretaxcost=#{pretaxcost}, taxedcost=#{taxedcost}, fundtaxtime=#{fundtaxtime}, istax=1 WHERE id=#{id};
+:璁剧疆 pretaxcost 鍜� taxedcost;
+:璁剧疆 fundtaxtime;
+:璁剧疆 istax = 1;
+
+:杩斿洖鎴愬姛;
+
+stop
+
+@enduml
+
+'涓昏SQL璇彞璇存槑锛�
+
+-- 1. 鑾峰彇鏈�澶undTaxId
+SELECT MAX(id) FROM service_fundtax;
+
+-- 2. 鏍规嵁fundTaxId鏌ヨServiceFund璁板綍
+SELECT * FROM service_fund
+WHERE fund_tax_id = #{fundTaxId} AND del_flag = 0;
+
+-- 3. 鏍规嵁fundid鏌ヨServiceFunddetail璁板綍
+SELECT * FROM service_funddetail
+WHERE fundid = #{fundid};
+
+-- 4. 鏌ヨ璇ヨ韩浠借瘉鍙锋湰鏈堟渶澶у簭鍙�
+SELECT MAX(xh) FROM service_funddetail
+WHERE idcardno = #{idcardno}
+ AND tax_time >= #{firstDay}
+ AND tax_time <= #{taxTime};
+
+-- 5. 鏌ヨ璇ヨ韩浠借瘉鍙锋湰鏈堢疮璁＄◣鍓嶃�佺◣閲戙�佺◣鍚庯紙涓嶅寘鍚湰娆★級
+SELECT
+ SUM(amount) as amounts,
+ SUM(taxamount) as taxAmounts,
+ SUM(taxedamount) as taxedAmounts
+FROM service_funddetail a
+LEFT JOIN service_fund b ON a.fundid = b.id
+WHERE a.idcardno = #{idcardno}
+ AND a.tax_time >= #{firstDay}
+ AND a.tax_time <= #{taxTime}
+ AND a.xh < #{xh}
+ AND b.fundtaxtime <= #{fundtaxtime};
+
+-- 6. 鏇存柊ServiceFunddetail璁板綍
+UPDATE service_funddetail
+SET
+ amount = #{amount},
+ taxamount = #{taxamount},
+ taxedamount = #{taxedamount},
+ tax_time = #{taxTime},
+ xh = #{xh}
+WHERE id = #{id};
+
+-- 7. 鏇存柊ServiceFund璁板綍
+UPDATE service_fund
+SET
+ pretaxcost = #{pretaxcost},
+ taxedcost = #{taxedcost},
+ fundtaxtime = #{fundtaxtime},
+ istax = 1
+WHERE id = #{id};
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index f09be90..9417265 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -76,10 +77,11 @@
*/
@PostMapping("/getToken")
public AjaxResult openidLogin(@RequestBody ThirdLoginBody thirdLoginBody) {
- AjaxResult ajax = AjaxResult.success();
- String token = loginService.getToken(thirdLoginBody.getUsername(), thirdLoginBody.getPassword());
- ajax.put(Constants.TOKEN, token);
- return ajax;
+// AjaxResult ajax = AjaxResult.success();
+ String token = loginService.getToken(thirdLoginBody.getUserName(), thirdLoginBody.getPassWord());
+ Map<String,String> map=new HashMap<>();
+ map.put("token",token);
+ return AjaxResult.success(map);
}
/**
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index e69acfc..4af78d2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -7,9 +7,9 @@
# 涓诲簱鏁版嵁婧�
master:
# 寮�鍙戠幆澧�
- url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
- username: hxsoft
- password: Hxerp2000
+ url: jdbc:mysql://116.62.18.175:6002/opo?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ username: opo
+ password: Smartor.2023
# 浠庡簱鏁版嵁婧�
slave:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b7a69f2..cd33931 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: srm
+ active: druid
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -124,11 +124,11 @@
urlPatterns: /system/*,/monitor/*,/tool/*
# 鍗忓弸娴佺▼鍙戣捣鎺ュ彛
-xyurl: http://{{ip}}:{{port}}/seeyon/rest/bpm/process/start
-rexyurl: http://{{ip}}:{{port}}/seeyon/rest/bpm/process/restart
+xyurl: http://129.88.242.39:8899/seeyon/rest/bpm/process/start
+rexyurl: http://129.88.242.39:8899/seeyon/rest/bpm/process/reStart
#涓庡崗鍙嬩氦浜掔殑鏂板姛鑳藉紑鍏� 1寮� 2鍏�
-newSwitch: 2
+newSwitch: 1
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/ThirdLoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/ThirdLoginBody.java
new file mode 100644
index 0000000..c4125db
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/ThirdLoginBody.java
@@ -0,0 +1,23 @@
+package com.ruoyi.common.core.domain.model;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鐧诲綍瀵硅薄
+ *
+ * @author ruoyi
+ */
+@Data
+public class ThirdLoginBody {
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String userName;
+
+ /**
+ * 鐢ㄦ埛瀵嗙爜
+ */
+ private String passWord;
+
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 74b4738..d5ea1c8 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -191,8 +191,9 @@
public String getToken(String username, String code) {
SysUser sysUser = sysUserMapper.selectUserByDingUserId(code);
+ System.out.println("sysUser鐨勭粨鏋滀负锛�" + sysUser);
//鏌ュ嚭鏉ヤ笉瀵圭殑璇濓紝灏辫繑鍥瀗ull
- if (!sysUser.getUserName().equals(username)) return null;
+ if (!sysUser.getUserName().trim().equals(username.trim())) return null;
LoginUser loginUser = new LoginUser();
loginUser.setUserId(sysUser.getUserId());
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceCodeAndPyaWay.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceCodeAndPyaWay.java
new file mode 100644
index 0000000..6f15067
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceCodeAndPyaWay.java
@@ -0,0 +1,60 @@
+package com.ruoyi.project.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 淇敼缂栧彿涓庢敮浠樻柟寮忓叆鍙�
+ *
+ * @author ruoyi
+ * @date 2022-01-24
+ */
+@Data
+@ApiModel("缂栧彿涓庢敮浠樻柟寮忓叆鍙�")
+public class ServiceCodeAndPyaWay extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 閫�鍥炵紪鍙凤紙涓婚敭锛�
+ */
+ @ApiModelProperty("閫�鍥炵紪鍙�")
+ @Excel(name = "閫�鍥炵紪鍙凤紙涓婚敭锛�")
+ private Long backCode;
+
+ /**
+ * 閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒
+ */
+ @ApiModelProperty("閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒")
+ @Excel(name = "閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒 ")
+ private String applytype;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty("缂栧彿")
+ @Excel(name = "缂栧彿")
+ private String bh;
+
+ /**
+ * 鏀粯鏂瑰紡
+ */
+ @ApiModelProperty("鏀粯鏂瑰紡")
+ @Excel(name = "鏀粯鏂瑰紡")
+ private String zffs;
+
+ /**
+ * 鏀粯鏃ユ湡
+ */
+ @ApiModelProperty("鏀粯鏃ユ湡")
+ @Excel(name = "鏀粯鏃ユ湡")
+ private String riqi;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index 56b3105..8b24dc3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -393,6 +393,9 @@
@Excel(name = "绋庨噾")
private Double taxcost;
+ @ApiModelProperty("鍗忓弸瑕佹眰鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊�")
+ private String summaryId;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessDocVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessDocVO.java
new file mode 100644
index 0000000..b3ccc96
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessDocVO.java
@@ -0,0 +1,44 @@
+package com.ruoyi.project.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 绗笁鏂规祦绋嬮��鍥炲叆鍙傦紙鑷磋繙鍏徃閫�鍥炵殑鍏ュ弬锛�
+ *
+ * @author ruoyi
+ * @date 2022-01-24
+ */
+@Data
+@ApiModel("绗笁鏂规祦绋嬮��鍥炲叆鍙�")
+public class ServiceProcessDocVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒
+ */
+ @ApiModelProperty("閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒")
+ @Excel(name = "閫�鍥炵被鍨� 0锛氬樊鏃呰垂 1涓撳鍔冲姟璐� 2浼︾悊涓撳鍔冲姟璐� 3鍖诲鎴愭湰 4鍔炲叕璐圭敤 5缁╂晥瀹℃壒 ")
+ private String applytype;
+
+ /**
+ * 閫�鍥炵紪鍙凤紙涓婚敭锛�
+ */
+ @ApiModelProperty("閫�鍥炵紪鍙�")
+ @Excel(name = "閫�鍥炵紪鍙凤紙涓婚敭锛�")
+ private Long backCode;
+//
+// /**
+// * 閫�鍥炲師鍥�
+// */
+// @ApiModelProperty("閫�鍥炲師鍥�")
+// @Excel(name = "閫�鍥炲師鍥�")
+// private String backReason;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessVO.java
index 3e9e186..625eca6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceProcessVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -32,7 +33,7 @@
*/
@ApiModelProperty("閫�鍥炵紪鍙�")
@Excel(name = "閫�鍥炵紪鍙凤紙涓婚敭锛�")
- private Long backCode;
+ private String backCode;
/**
* 娴佺▼鍐呭锛屾搷浣滃啓鎰忚寤鸿
@@ -46,7 +47,7 @@
*/
@ApiModelProperty("閫�娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱 鍥炲師鍥� 3:瀹岀粨")
@Excel(name = "娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱")
- private Integer flowconclusion;
+ private String flowconclusion;
/**
* 瀹℃牳浜虹紪鍙�
@@ -64,6 +65,7 @@
@ApiModelProperty("鏍￠獙鏃堕棿")
@Excel(name = "鏍￠獙鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date checkTime;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index f51a9f3..90f0931 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -360,5 +360,9 @@
@ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬惁 1锛氭槸")
private Integer uploadStates;
+
+ @ApiModelProperty("鍗忓弸瑕佹眰鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊�")
+ private String summaryId;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FundVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FundVO.java
index bb1e5f7..d882f29 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FundVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FundVO.java
@@ -66,6 +66,7 @@
private Long fdattachcount;
private String fdremark;
private String fdrecordstatus;
+ private String summaryId;
private Long del_flag;
private String create_by;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
index 5e9be8e..e7a8546 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
@@ -27,4 +27,6 @@
List<ServiceFundShared> getFundShareInfoById(Long fundid);
Boolean delfundsharedInfoById(@Param("fundId") Long fundId,@Param("serfunid") Long serfunid);
+
+ Boolean updateShareByfundid(ServiceFundShared serviceFundShared);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementSharedMapper.java
index c8339c4..3e855d2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementSharedMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementSharedMapper.java
@@ -28,4 +28,6 @@
Boolean delResharedInfoById(Long id);
Boolean delResharedInfoByReimid(Long reimid);
+
+ Boolean updateReimShareByfundid(ServiceReimbursementShared serviceReimbursementShared);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index d8cbf61..686e6dd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -27,6 +27,8 @@
public Boolean processlog(ServiceProcessVO serviceProcessVO);
+ public Boolean updatecodepay(ServiceCodeAndPyaWay serviceCodeAndPyaWay);
+
/**
* 鏌ヨ璐圭敤鐢宠涓诲垪琛�
*
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 2e80ce8..4f24c58 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -6,6 +6,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,7 +20,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
@@ -24,7 +27,6 @@
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysUserService;
-import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.*;
@@ -34,14 +36,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -198,7 +198,7 @@
Long flowlevel = null;
if (serviceProcessVO.getApplytype().equals("0")) {
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
- serviceReimbursement.setId(serviceProcessVO.getBackCode());
+ serviceReimbursement.setId(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
List<ServiceReimbursement> serviceReimbursementList = iServiceReimbursementService.queryList(serviceReimbursement);
if (CollectionUtils.isEmpty(serviceReimbursementList)) {
log.error("serviceReimbursementList娌℃湁鏌ュ埌鏁版嵁锛歿}", serviceProcessVO.getBackCode());
@@ -212,7 +212,7 @@
applytype = "0";
} else {
ServiceFund serviceFund = new ServiceFund();
- serviceFund.setId(serviceProcessVO.getBackCode());
+ serviceFund.setId(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
List<ServiceFund> serviceFunds = queryInfoById(serviceFund);
if (CollectionUtils.isEmpty(serviceFunds)) {
log.error("serviceFunds娌℃湁鏌ュ埌鏁版嵁锛歿}", serviceProcessVO.getBackCode());
@@ -225,22 +225,23 @@
applytype = serviceFunds.get(0).getApplytype();
}
- //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
- ServiceFundflow serviceFundflow = new ServiceFundflow();
- serviceFundflow.setCreateBy("admin");
- serviceFundflow.setCreateTime(new Date());
- serviceFundflow.setUpdateBy("admin");
- serviceFundflow.setUpdateTime(new Date());
- serviceFundflow.setCheckusername(serviceProcessVO.getCheckusername());
- serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
- serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(2);
- serviceFundflow.setFlowlevel(flowlevel.intValue());
- if (serviceProcessVO.getFlowconclusion() == 3) serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(applytype);
- serviceFundflow.setFundid(serviceProcessVO.getBackCode());
- serviceFundflow.setCheckTime(serviceProcessVO.getCheckTime());
- fundflowService.save(serviceFundflow);
+// //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+// ServiceFundflow serviceFundflow = new ServiceFundflow();
+// serviceFundflow.setCreateBy("admin");
+// serviceFundflow.setCreateTime(new Date());
+// serviceFundflow.setUpdateBy("admin");
+// serviceFundflow.setUpdateTime(new Date());
+// serviceFundflow.setCheckusername(serviceProcessVO.getCheckusername());
+// serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
+// serviceFundflow.setFlowconclusion(1);
+// serviceFundflow.setFundtype(2);
+// serviceFundflow.setFlowlevel(flowlevel.intValue());
+// if (StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) && serviceProcessVO.getFlowconclusion().equals("3"))
+// serviceFundflow.setFlowlevel(999);
+// serviceFundflow.setApplytype(applytype);
+// serviceFundflow.setFundid(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
+// serviceFundflow.setCheckTime(serviceProcessVO.getCheckTime());
+// fundflowService.save(serviceFundflow);
SysUser sysUser = sysUserService.selectUserByUserName(userNo);
@@ -260,6 +261,42 @@
serviceSystemmessage.setMessagecontent(serviceProcessVO.getFlowcontent());
iServiceSystemmessageService.save(serviceSystemmessage);
+ return true;
+ }
+
+ @Override
+ public Boolean updatecodepay(ServiceCodeAndPyaWay serviceCodeAndPyaWay) {
+ Integer i = null;
+ if (StringUtils.isNotEmpty(serviceCodeAndPyaWay.getApplytype()) && !serviceCodeAndPyaWay.getApplytype().equals("0")) {
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceCodeAndPyaWay.getBackCode());
+ serviceFund.setBh(serviceCodeAndPyaWay.getBh());
+ serviceFund.setZffs(serviceCodeAndPyaWay.getZffs());
+ serviceFund.setRiqi(serviceCodeAndPyaWay.getRiqi());
+ i = serviceFundMapper.updateById(serviceFund);
+
+ ServiceFundShared serviceFundShared = new ServiceFundShared();
+ serviceFundShared.setSerfunid(serviceFund.getId());
+ serviceFundShared.setZffs(serviceFund.getZffs());
+ serviceFundShared.setRiqi(serviceFund.getRiqi());
+ serviceFundShared.setBh(serviceFund.getBh());
+ serviceFundSharedMapper.updateShareByfundid(serviceFundShared);
+ } else {
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setId(serviceCodeAndPyaWay.getBackCode());
+ serviceReimbursement.setBh(serviceCodeAndPyaWay.getBh());
+ serviceReimbursement.setZffs(serviceCodeAndPyaWay.getZffs());
+ serviceReimbursement.setRiqi(serviceCodeAndPyaWay.getRiqi());
+ i = serviceReimbursementMapper.updateById(serviceReimbursement);
+
+ ServiceReimbursementShared serviceReimbursementShared = new ServiceReimbursementShared();
+ serviceReimbursementShared.setReimid(serviceReimbursement.getId());
+ serviceReimbursementShared.setBh(serviceReimbursement.getBh());
+ serviceReimbursementShared.setZffs(serviceReimbursement.getZffs());
+ serviceReimbursementShared.setRiqi(serviceReimbursement.getRiqi());
+ serviceReimbursementSharedMapper.updateReimShareByfundid(serviceReimbursementShared);
+ }
+ if (i == 0) return false;
return true;
}
@@ -579,31 +616,62 @@
data.put("data", data2);
//妯℃澘缂栧彿锛岀敱鑷磋繙鏂规彁渚涳紝璇ュ弬鏁板喅瀹氬彂璧峰崗鍚岀郴缁熶腑鍝釜娴佺▼
- data.put("templateCode", "001");
+ data.put("templateCode", "fybxd_rzhc_ceshi");
//鏄惁涓哄緟鍙戯細0:鏂板缓-鍙戦�侊紱1:鏂板缓-淇濆瓨寰呭彂
data.put("draft", "0");
//鍗忓悓鏍囬鍖洪檮浠讹紝Long鍨婰ist锛屽�间负闄勪欢鐨処d銆侷d鏄檮浠舵帴鍙ｅ搷搴旂粨鏋滀腑fileUrl瀛楁鐨勫��
- data.put("attachments", null);
+// data.put("attachments", null);
//鍗忓悓鍏枃鐨刬d
- data.put("relateDoc", "col|123,456;doc|321,654");
+// data.put("relateDoc", "col|123,456;doc|321,654");
//鏈缃彇妯℃澘璁剧疆鐨勬爣棰�
data.put("subject", "null");
+ ServiceFund serviceFund1 = serviceFundMapper.selectById(serviceFund.getId());
+ data.put("summaryId", serviceFund1.getSummaryId());
map.put("data", data);
String strRes = null;
if (!active.equals("druid")) {
//濡傛灉鏄湰鍦扮幆澧冿紝灏变笉璋冭繖涓簡
+ String token = getToken();
+ JSONObject json1 = JSONObject.parseObject(token);
+ token = json1.get("id").toString();
+ ObjectMapper objectMapper = new ObjectMapper();
+ String json = null;
if (serviceFund.getBackflowlevel() == 100L) {
//鍐嶆鍙戣捣
- strRes = HttpClientKit.postOpr(rexyurl, map.toString());
+ try {
+ json = objectMapper.writeValueAsString(map);
+ log.error("-----------------鍐嶆鍙戣捣鐨剈rl涓猴細{}, 鍏ュ弬涓猴細{}", rexyurl + "?token=" + token, json);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ strRes = HttpClientKit.postOpr(rexyurl + "?token=" + token, json);
} else {
//棣栨鍙戣捣
- strRes = HttpClientKit.postOpr(xyurl, map.toString());
+ try {
+ json = objectMapper.writeValueAsString(map);
+ log.error("-----------------棣栨鍙戣捣鐨剈rl涓猴細{}, 鍏ュ弬涓猴細{}", xyurl + "?token=" + token, json);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ strRes = HttpClientKit.postOpr(xyurl + "?token=" + token, json);
+
+ // 灏唖ummaryId淇濆瓨璧锋潵,骞跺皢璇ュ�间繚瀛樺埌fund涓紝鐢ㄤ簬鍐嶆鍙戣捣鏃讹紝浣跨敤锛堝崗鍙嬭姹傦紝鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊硷級
+ JsonObject root = JsonParser.parseString(strRes).getAsJsonObject();
+ String code = root.get("code").getAsString();
+ if ("0".equals(code)) {
+ String appBusinessData = root.getAsJsonObject("data").get("app_bussiness_data").getAsString();
+ JsonObject appDataObj = JsonParser.parseString(appBusinessData).getAsJsonObject();
+ String summaryId = appDataObj.get("summaryId").getAsString();
+ serviceFund.setSummaryId(summaryId);
+ serviceFundMapper.updateById(serviceFund);
+ }
}
}
- com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSONObject.parseObject(strRes);
- String code = jsonObject.getJSONObject("code").toString();
+ log.error("------------------strRes鐨勫�间负锛歿}", strRes);
+ JSONObject jsonObject = JSONObject.parseObject(strRes);
+ String code = jsonObject.getString("code");
if (!code.equals("0")) {
return false;
}
@@ -626,12 +694,12 @@
map.put("鏀剁泭浜哄灞炴垨涓撳", serviceFunddetailShared.getBeneficiaryname());
map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxamount());
map.put("浣滃簾鏈�缁堥噾棰�", null);
- String fpuuid = IdUtils.simpleUUID();
+ Long fpuuid = System.currentTimeMillis() + 5;
map.put("鍙戠エ闄勪欢", fpuuid);
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
map.put("绋庨", null);
- String qtuuid = IdUtils.simpleUUID();
+ long qtuuid = System.currentTimeMillis() + 20;
map.put("鍏朵粬闄勪欢", qtuuid);
map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode());
map.put("棰勭畻椤圭洰", null);
@@ -682,7 +750,7 @@
formmain_0831.put("鎶ラ攢浜哄憳", serviceFundShared.getUsername());
formmain_0831.put("涓氬姟鍖哄煙", serviceFundShared.getDeptmentname());
formmain_0831.put("缁忔墜浜�", serviceFundShared.getUsername());
- formmain_0831.put("濉〃鏃堕棿", serviceFundShared.getApplyTime());
+ formmain_0831.put("濉〃鏃堕棿", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceFundShared.getApplyTime()));
formmain_0831.put("鎶ラ攢閲戦鍚堣", serviceFundShared.getPretaxcost());
formmain_0831.put("涓婁紶闄勪欢", null);
formmain_0831.put("澶囨敞", null);
@@ -715,7 +783,7 @@
formmain_0831.put("鍑瘉绫诲埆", null);
formmain_0831.put("绋庡悗閲戦鍚堣", serviceFundShared.getTaxedcost());
formmain_0831.put("鍘嗗彶瀹℃壒璁板綍", null);
- formmain_0831.put("琛ㄥ崟缂栧彿", serviceFundShared.getBh());
+ formmain_0831.put("琛ㄥ崟缂栧彿", serviceFundShared.getSerfunid());
formmain_0831.put("鍘嗗彶瀹℃壒鍗曟煡璇�", null);
return formmain_0831;
}
@@ -1530,18 +1598,19 @@
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) throws Exception {
//涓婁紶OA鏂囦欢
- String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
- //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("userName", "opo");
- map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName", "demo3");
+// String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
+// //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+// Map<String, Object> map = new HashMap<String, Object>();
+// map.put("userName", "opo");
+// map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+// map.put("loginName", "demo3");
+//
+// JSONObject jsonObj = new JSONObject(map);
+//
+// System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+// String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
+ String strRes = getToken();
- JSONObject jsonObj = new JSONObject(map);
-
- System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
- String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
- //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
JSONObject json1 = JSONObject.parseObject(strRes);
strRes = json1.get("id").toString();
@@ -1563,6 +1632,22 @@
//鍙戠エ闄勪欢
uploadFile(filePath, strFUrl, invoicefilesList, invoicefilesArray, remShare, "2");
return 0;
+ }
+
+ private String getToken() {
+ //涓婁紶OA鏂囦欢
+ String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
+ //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("userName", "opo");
+ map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+ map.put("loginName", "demo");
+
+ JSONObject jsonObj = new JSONObject(map);
+
+ System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+ String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());
+ return strRes;
}
@@ -1685,12 +1770,12 @@
serviceFundflow.setCreateTime(new Date());
serviceFundflow.setUpdateTime(new Date());
serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
- serviceFundflow.setFlowconclusion(serviceProcessVO.getFlowconclusion());
+ serviceFundflow.setFlowconclusion(StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) ? Integer.valueOf(serviceProcessVO.getFlowconclusion()) : null);
if (serviceProcessVO.getApplytype() == "0") serviceFundflow.setFundtype(1);
if (serviceProcessVO.getApplytype() == "1") serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(100);
serviceFundflow.setApplytype(serviceProcessVO.getApplytype());
- serviceFundflow.setFundid(serviceProcessVO.getBackCode());
+ serviceFundflow.setFundid(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
fundflowService.save(serviceFundflow);
ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
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 6ff7672..0cc543f 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
@@ -1,18 +1,21 @@
package com.ruoyi.project.service.impl;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.HttpClientKit;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.project.domain.*;
@@ -22,23 +25,22 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
-import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysUserService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 鎶ラ攢鐢宠Service涓氬姟灞傚鐞�
@@ -550,28 +552,54 @@
data.put("data", data2);
//妯℃澘缂栧彿锛岀敱鑷磋繙鏂规彁渚涳紝璇ュ弬鏁板喅瀹氬彂璧峰崗鍚岀郴缁熶腑鍝釜娴佺▼
- data.put("templateCode", "001");
+ data.put("templateCode", "cyfbxd_rzhc_ceshi");
//鏄惁涓哄緟鍙戯細0:鏂板缓-鍙戦�侊紱1:鏂板缓-淇濆瓨寰呭彂
data.put("draft", "0");
//鍗忓悓鏍囬鍖洪檮浠讹紝Long鍨婰ist锛屽�间负闄勪欢鐨処d銆侷d鏄檮浠舵帴鍙ｅ搷搴旂粨鏋滀腑fileUrl瀛楁鐨勫��
- data.put("attachments", null);
- //鍗忓悓鍏枃鐨刬d
- data.put("relateDoc", "col|123,456;doc|321,654");
+// data.put("attachments", null);
+// //鍗忓悓鍏枃鐨刬d
+// data.put("relateDoc", "col|123,456;doc|321,654");
//鏈缃彇妯℃澘璁剧疆鐨勬爣棰�
- data.put("subject", "null");
+ data.put("subject", "");
+ ServiceReimbursement serviceReimbursement1 = serviceReimbursementMapper.selectById(serviceReimbursement.getId());
+ data.put("summaryId", serviceReimbursement1.getSummaryId() == null ? "" : serviceReimbursement1.getSummaryId());
map.put("data", data);
String strRes = null;
if (!active.equals("druid")) {
//濡傛灉鏄湰鍦扮幆澧冿紝灏变笉璋冭繖涓簡
+ String token = getToken();
+ JSONObject json1 = JSONObject.parseObject(token);
+ token = json1.get("id").toString();
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ String json = null;
+ try {
+ json = objectMapper.writeValueAsString(map);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
if (serviceReimbursement.getBackflowlevel() == 100L) {
- strRes = HttpClientKit.postOpr(rexyurl, map.toString());
+ log.error("-----------------Reimbursement鍐嶆鍙戣捣鐨剈rl涓猴細{}, 鍏ュ弬涓猴細{}", rexyurl + "?token=" + token, json);
+ strRes = HttpClientKit.postOpr(rexyurl + "?token=" + token, json);
} else {
- strRes = HttpClientKit.postOpr(xyurl, map.toString());
+ log.error("-----------------Reimbursement棣栨鍙戣捣鐨剈rl涓猴細{}, 鍏ュ弬涓猴細{}", xyurl + "?token=" + token, json);
+ strRes = HttpClientKit.postOpr(xyurl + "?token=" + token, json);
+ // 灏唖ummaryId淇濆瓨璧锋潵,骞跺皢璇ュ�间繚瀛樺埌fund涓紝鐢ㄤ簬鍐嶆鍙戣捣鏃讹紝浣跨敤锛堝崗鍙嬭姹傦紝鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊硷級
+ JsonObject root = JsonParser.parseString(strRes).getAsJsonObject();
+ String code = root.get("code").getAsString();
+ if ("0".equals(code)) {
+ String appBusinessData = root.getAsJsonObject("data").get("app_bussiness_data").getAsString();
+ JsonObject appDataObj = JsonParser.parseString(appBusinessData).getAsJsonObject();
+ String summaryId = appDataObj.get("summaryId").getAsString();
+ serviceReimbursement.setSummaryId(summaryId);
+ serviceReimbursementMapper.updateById(serviceReimbursement);
+ }
}
}
- com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSONObject.parseObject(strRes);
- String code = jsonObject.getJSONObject("code").toString();
+ log.error("-----Reimbursement-------------strRes鐨勫�间负锛歿}", strRes);
+ JSONObject jsonObject = JSONObject.parseObject(strRes);
+ String code = jsonObject.getString("code");
if (!code.equals("0")) {
return false;
}
@@ -588,36 +616,37 @@
Map<String, Object> map = new HashMap<>();
map.put("浜ら�氬伐鍏�", reimbursementdetailShared.getTraffictype());
map.put("浜ら�氳垂", reimbursementdetailShared.getTrafficexpense());
- map.put("甯傚唴浜ら��", reimbursementdetailShared.getTraffictype2());
+ 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("閲戦鍚堣", null);
- map.put("鍑哄樊鏃堕棿璧�", reimbursementdetailShared.getStarttime());
+ map.put("閲戦鍚堣", "");
+ map.put("鍑哄樊鏃堕棿璧�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getStarttime()));
map.put("鍑哄彂鍦扮偣", reimbursementdetailShared.getDeparture());
- map.put("鍑哄樊鏃堕棿姝�", reimbursementdetailShared.getEndtime());
+ map.put("鍑哄樊鏃堕棿姝�", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getEndtime()));
map.put("鍑哄樊鐩殑鍦�", reimbursementdetailShared.getDestination());
map.put("澶╂暟", reimbursementdetailShared.getDays());
- map.put("瀹為檯鎶ラ攢閲戦", null);
+ 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("瀹為檯鎶ラ攢閲戦", total);
map.put("璐㈠姟澶囨敞", reimbursementdetailShared.getRemark());
map.put("id", reimbursementdetailShared.getRdid());
map.put("鍑哄樊浜�", reimbursementdetailShared.getPersonname());
- map.put("鍥炰氦閫氬伐鍏�", null);
+ map.put("鍥炰氦閫氬伐鍏�", "");
map.put("浜哄憳绫诲埆", reimbursementdetailShared.getPersontype());
- map.put("浣忓璐规爣鍑�", null);
+ map.put("浣忓璐规爣鍑�", "");
map.put("浣忓璐规爣鍑嗗悎璁�", reimbursementdetailShared.getHotelexpense());
- String fpuuid = IdUtils.simpleUUID();
+ Long fpuuid = System.currentTimeMillis();
map.put("鍙戠エ闄勪欢", fpuuid);
- map.put("绁ㄦ嵁璇嗗埆", null);
- map.put("璇嗗埆浜�", null);
- map.put("搴忓彿1", null);
- String qtuuid = IdUtils.simpleUUID();
+ map.put("绁ㄦ嵁璇嗗埆", "");
+ map.put("璇嗗埆浜�", "");
+ map.put("搴忓彿1", "");
+ Long qtuuid = System.currentTimeMillis();
map.put("鍏朵粬闄勪欢", qtuuid);
- map.put("涓汉绁ㄥす鐢ㄦ埛", null);
- map.put("璇嗗埆绁ㄦ嵁", null);
+ map.put("涓汉绁ㄥす鐢ㄦ埛", "");
+ map.put("璇嗗埆绁ㄦ嵁", "");
list.add(map);
@@ -654,6 +683,10 @@
return allMap;
}
+ private BigDecimal safe(BigDecimal val) {
+ return val == null ? BigDecimal.ZERO : val;
+ }
+
private List<Map<String, Object>> formson_1211(List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
@@ -666,10 +699,10 @@
map.put("寮�鎴烽摱琛�", serviceReimbursementpayeeShared.getBankname());
map.put("鎵撴閲戦", serviceReimbursementpayeeShared.getAmount());
map.put("浜哄憳绫诲埆鎵撴", serviceReimbursementpayeeShared.getPersontype());
- map.put("鏍哥畻椤圭洰", null);
- map.put("棰勭畻椤圭洰", null);
- map.put("鍊熸柟鎽樿", null);
- map.put("璐锋柟鎽樿", null);
+ map.put("鏍哥畻椤圭洰", "");
+ map.put("棰勭畻椤圭洰", "");
+ map.put("鍊熸柟鎽樿", "");
+ map.put("璐锋柟鎽樿", "");
list.add(map);
}
return list;
@@ -678,21 +711,21 @@
private Map<String, Object> formmain_1209(ServiceReimbursementShared serviceReimbursementShared) {
Map<String, Object> formmain_1209 = new HashMap<>();
- formmain_1209.put("鎶ラ攢鏃ユ湡", serviceReimbursementShared.getApplyTime());
- formmain_1209.put("鍑哄樊浜�-浣滃簾", null);
+ formmain_1209.put("鎶ラ攢鏃ユ湡", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceReimbursementShared.getApplyTime()));
+ formmain_1209.put("鍑哄樊浜�-浣滃簾", "");
formmain_1209.put("鎶ラ攢浜�", serviceReimbursementShared.getUsername());
formmain_1209.put("鍖哄煙缁勯暱", serviceReimbursementShared.getManagername());
formmain_1209.put("鍑哄樊浜嬬敱", serviceReimbursementShared.getReason());
- formmain_1209.put("澶╂暟鍚堣", null);
+ formmain_1209.put("澶╂暟鍚堣", 0.00);
formmain_1209.put("浜ら�氳垂鍚堣", serviceReimbursementShared.getTotalamount());
- formmain_1209.put("甯傚唴浜ら�氬悎璁�", null);
- formmain_1209.put("浣忓璐瑰悎璁�", null);
- formmain_1209.put("鏉傝垂鍚堣", null);
- formmain_1209.put("浼欓璐规姤閿�鍚堣", null);
- formmain_1209.put("浼欓璐硅ˉ鍔╁悎璁�", null);
- formmain_1209.put("鍏朵粬璐圭敤鍚堣", null);
+ formmain_1209.put("甯傚唴浜ら�氬悎璁�", 0.00);
+ formmain_1209.put("浣忓璐瑰悎璁�", 0.00);
+ formmain_1209.put("鏉傝垂鍚堣", 0.00);
+ formmain_1209.put("浼欓璐规姤閿�鍚堣", 0.00);
+ formmain_1209.put("浼欓璐硅ˉ鍔╁悎璁�", 0.00);
+ formmain_1209.put("鍏朵粬璐圭敤鍚堣", 0.00);
formmain_1209.put("棰嗘閲戦澶у啓", serviceReimbursementShared.getBigstrmoney());
- formmain_1209.put("棰嗘閲戦", serviceReimbursementShared.getTotalamount());
+ formmain_1209.put("棰嗘閲戦", serviceReimbursementShared.getAmountrequested());
formmain_1209.put("璐㈠姟瀹℃壒", serviceReimbursementShared.getFinancechecher());
formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", serviceReimbursementShared.getFinancedirector());
formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", serviceReimbursementShared.getOfficedirector());
@@ -700,39 +733,39 @@
formmain_1209.put("涓氬姟鍓櫌闀垮鎵�", serviceReimbursementShared.getBusvicepresident());
formmain_1209.put("璐㈠姟鍓櫌闀垮鎵�", serviceReimbursementShared.getFinvicepresident());
formmain_1209.put("涓績璐熻矗浜哄鎵�", serviceReimbursementShared.getOpochecker());
- formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", null);
- formmain_1209.put("鍗″彿-浣滃簾", null);
+ formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", "");
+ formmain_1209.put("鍗″彿-浣滃簾", "");
formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursementShared.getZffs());
- formmain_1209.put("缁勯暱", null);
- formmain_1209.put("瀹℃壒浜哄憳", null);
+ formmain_1209.put("缁勯暱", "");
+ formmain_1209.put("瀹℃壒浜哄憳", "");
formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursementShared.getRiqi());
- formmain_1209.put("涓婁紶闄勪欢", null);
- formmain_1209.put("鎵撴鍚堣", null);
- formmain_1209.put("鍙戠エ璇嗗埆-浣滃簾", null);
- formmain_1209.put("璇嗗埆浜�-浣滃簾", null);
- formmain_1209.put("璐㈠姟瀹℃壒绛惧瓧", null);
+ formmain_1209.put("涓婁紶闄勪欢", "");
+ formmain_1209.put("鎵撴鍚堣", 0.00);
+ formmain_1209.put("鍙戠エ璇嗗埆-浣滃簾", "");
+ formmain_1209.put("璇嗗埆浜�-浣滃簾", "");
+ formmain_1209.put("璐㈠姟瀹℃壒绛惧瓧", "");
formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒绛惧瓧", serviceReimbursementShared.getFinancedirector());
- formmain_1209.put("琛ㄥ崟缂栧彿1", null);
- formmain_1209.put("CIF璐﹀閰嶇疆1", null);
- formmain_1209.put("闄㈠尯", null);
- formmain_1209.put("涓氬姟鍖哄煙", null);
- formmain_1209.put("璐锋柟绉戠洰", null);
- formmain_1209.put("缂栫爜", null);
- formmain_1209.put("鏄惁鏀粯", null);
- formmain_1209.put("鍑瘉鍙�", null);
- formmain_1209.put("閾惰鍥炲崟", null);
- formmain_1209.put("OFD", null);
- formmain_1209.put("琛ㄥ崟闄勪欢", null);
- formmain_1209.put("10204", null);
- formmain_1209.put("鐜伴噾娴侀噺鍒嗘瀽", null);
+ formmain_1209.put("琛ㄥ崟缂栧彿1", "");
+ formmain_1209.put("CIF璐﹀閰嶇疆1", "");
+ formmain_1209.put("闄㈠尯", "");
+ formmain_1209.put("涓氬姟鍖哄煙", "");
+ formmain_1209.put("璐锋柟绉戠洰", "");
+ formmain_1209.put("缂栫爜", "");
+ formmain_1209.put("鏄惁鏀粯", "");
+ formmain_1209.put("鍑瘉鍙�", "");
+ formmain_1209.put("閾惰鍥炲崟", "");
+ formmain_1209.put("OFD", "");
+ formmain_1209.put("琛ㄥ崟闄勪欢", "");
+ formmain_1209.put("10204", "");
+ formmain_1209.put("鐜伴噾娴侀噺鍒嗘瀽", "");
formmain_1209.put("鎹愮尞鑰�", serviceReimbursementShared.getDonorname());
- formmain_1209.put("鍑瘉绫诲埆", null);
- formmain_1209.put("鍚堣", null);
- formmain_1209.put("瀹為檯鍚堣", null);
- formmain_1209.put("浼欓琛ュ姪鍚堣", null);
- formmain_1209.put("鍘嗗彶瀹℃壒璁板綍", null);
- formmain_1209.put("琛ㄥ崟缂栧彿", serviceReimbursementShared.getBh());
- formmain_1209.put("鍘嗗彶瀹℃壒宸ㄩ箍鏌ヨ", null);
+ formmain_1209.put("鍑瘉绫诲埆", "");
+ formmain_1209.put("鍚堣", 0.00);
+ formmain_1209.put("瀹為檯鍚堣", 0.00);
+ formmain_1209.put("浼欓琛ュ姪鍚堣", 0.00);
+ formmain_1209.put("鍘嗗彶瀹℃壒璁板綍", "");
+ formmain_1209.put("琛ㄥ崟缂栧彿", serviceReimbursementShared.getReimid());
+ formmain_1209.put("鍘嗗彶瀹℃壒宸ㄩ箍鏌ヨ", "");
return formmain_1209;
}
@@ -741,20 +774,7 @@
log.info("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:{}", remShare);
System.out.println("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:" + remShare);
//涓婁紶OA鏂囦欢
- //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
- String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
- //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
- //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
-
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("userName", "opo");
- map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName", "demo3");
-
- JSONObject jsonObj = new JSONObject(map);
-
- System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
- String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());
+ String strRes = getToken();
JSONObject json1 = JSONObject.parseObject(strRes);
strRes = json1.get("id").toString();
@@ -776,6 +796,23 @@
return 0;
}
+ private String getToken() {
+ String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
+ //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
+ //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("userName", "opo");
+ map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+ map.put("loginName", "demo");
+
+ JSONObject jsonObj = new JSONObject(map);
+
+ System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+ String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());
+ return strRes;
+ }
+
private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceReimbursementdetailShared remShare, String flag) throws Exception {
if (!CollectionUtils.isEmpty(parseArray)) {
for (int i = 0; i < parseArray.size(); i++) {
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index fee27fe..4dcbf61 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -66,12 +66,14 @@
<result property="jxrq" column="jxrq"/>
<result property="fundTaxId" column="fund_tax_id"/>
<result property="taxcost" column="TaxCost"/>
+ <result property="summaryId" column="summary_id"/>
</resultMap>
<sql id="selectServiceFundVo">
select ID,
InfoID,
DonorNo,
+ summary_id,
DonorName,
del_flag,
create_by,
@@ -170,6 +172,7 @@
SELECT
`service_fund`.`ID` AS `id`,
`service_fund`.`InfoID` AS `infoid`,
+ `service_fund`.`summary_id` AS `summaryId`,
`service_fund`.`DonorNo` AS `donorno`,
`service_fund`.`DonorName` AS `donorname`,
`service_fund`.`UserNo` AS `userno`,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index 7f49f63..871bb2e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -9,7 +9,7 @@
<result property="infoid" column="InfoID"/>
<result property="donorno" column="DonorNo"/>
<result property="donorname" column="DonorName"/>
- <result property="delflag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -196,6 +196,21 @@
<if test="fundId != null">and ID = #{fundId}</if>
<if test="serfunid != null">and serfunid = #{serfunid}</if>
+ </update>
+
+
+ <update id="updateShareByfundid">
+ UPDATE service_fund_shared
+ SET
+ <if test="bh != null">bh = #{bh},</if>
+ <if test="riqi != null">riqi = #{riqi},</if>
+ <if test="zffs != null">zffs = #{zffs},</if>
+ update_time = sysdate()
+ WHERE
+ del_flag != 1
+ <if test="fundId != null">and ID = #{fundId}</if>
+ <if test="serfunid != null">and serfunid = #{serfunid}</if>
+
</update>
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 580a958..1159037 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.ruoyi.project.domain.ServiceReimbursement" id="ServiceReimbursementResult">
<result property="id" column="ID"/>
<result property="delFlag" column="del_flag"/>
+ <result property="summaryId" column="summary_id"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -71,6 +72,7 @@
<sql id="selectServiceReimbursementVo">
select ID,
del_flag,
+ summary_id,
person_num,
create_by,
create_time,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index a8831e8..5ee0cab 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -213,4 +213,15 @@
and del_flag != 1
</update>
+ <update id="updateReimShareByfundid">
+ UPDATE service_reimbursement_shared
+ SET
+ <if test="bh != null">bh = #{bh},</if>
+ <if test="riqi != null">riqi = #{riqi},</if>
+ <if test="zffs != null">zffs = #{zffs},</if>
+ update_time = sysdate()
+ WHERE reimid = #{reimid}
+ and del_flag != 1
+ </update>
+
</mapper>
--
Gitblit v1.9.3