From 5152d8c282f56853eff61071db43e20a8defa4b8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 13 十一月 2025 13:43:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 305 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 220 insertions(+), 85 deletions(-)
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..0434b71 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,17 +6,21 @@
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;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.ApplyTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HttpClientKit;
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 +28,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,17 +37,16 @@
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;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
/**
@@ -176,7 +178,7 @@
serviceFundSharedMapper.delfundsharedInfoById(null, serviceFund1.getId());
//杩欎釜娑堟伅鍙戦�侊紝灏变笉鍦ㄨ繖鍋氫簡锛屽湪瀹℃壒璁板綍鐨勬帴鍙ｉ噷鍋氾紙鍗虫棩蹇楁帴鍙ｏ級
- //sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber());
+// sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber());
}
return true;
@@ -198,7 +200,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 +214,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 +227,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 +263,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;
}
@@ -384,7 +423,8 @@
SysUser user = loginUser.getUser();
if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
- serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceFund.setFinancechecher(user.getNickName());
serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceFund.setRecordstatus(99);
@@ -406,6 +446,7 @@
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
serviceFundflow.setFundtype(2);
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setApplytype(serviceFund.getApplytype());
serviceFundflow.setFlowconclusion(CheckFlag);
serviceFundflow.setFlowcontent("閫氳繃");
@@ -417,7 +458,8 @@
List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId());
if (roleIds != null && roleIds.contains(11)) {
//11涓鸿储鍔�
- serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceFund.setFinancechecher(user.getNickName());
}
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
@@ -429,7 +471,6 @@
FlowLevel = 0;
RecordStatus = -1;
log.info("serviceFund杩涙潵浜嗗悧锛燂紵锛燂紵锛燂紵 :{},{}", RecordStatus, FlowLevel);
- System.out.println("serviceFund杩涙潵浜嗗悧锛燂紵锛燂紵锛燂紵");
} else {
RecordStatus = (FlowLevel + 1) * 2 - 1;
FlowLevel = (FlowLevel - 1);
@@ -465,6 +506,7 @@
serviceFundflow.setFundtype(2);
serviceFundflow.setApplytype(serviceFund.getApplytype());
serviceFundflow.setFlowconclusion(CheckFlag);
+ serviceFundflow.setCheckTime(new Date());
if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) {
serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
} else {
@@ -491,8 +533,6 @@
}
}
System.out.println("serviceFund鐨勫�兼槸--------:" + serviceFund);
- log.info("寮�濮嬫洿鏂扮殑鐨勫�兼槸--------");
-
Boolean aBoolean1 = updateById(serviceFund);
log.info("integer鏇存柊鐨勭殑鍊兼槸-------- :{}", aBoolean1);
ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
@@ -571,7 +611,7 @@
// 涓昏〃瀛楁鏁版嵁
Map<String, Object> data2 = new HashMap<>();
- data2.put("formmain_0831", getformmain_0831(fundShareInfos.get(0)));
+ data2.put("formmain_0831", getformmain_0831(serviceFund));
// 鏄庣粏琛ㄥ瓧娈垫暟鎹紝涓庨檮浠剁殑澶勭悊
Map<String, List<Map<String, Object>>> map1 = formson_0832(serviceFunddetailShareds);
data2.put("formson_0832", map1.get("formson_0832"));
@@ -579,31 +619,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;
}
@@ -611,12 +682,18 @@
return true;
}
+ private static final AtomicLong COUNTER = new AtomicLong(System.currentTimeMillis());
+
private Map<String, List<Map<String, Object>>> formson_0832(List<ServiceFunddetailShared> serviceFunddetailSharedList) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> annexfilesList = new ArrayList<>();
for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailSharedList) {
+ //闄勪欢澶勭悊
+ String annexfiles = serviceFunddetailShared.getAnnexfiles();
+ String invoicefiles = serviceFunddetailShared.getInvoicefiles();
+
Map<String, Object> map = new HashMap<>();
map.put("搴忓彿1", serviceFunddetailShared.getOrderno());
map.put("璐圭敤椤圭洰", serviceFunddetailShared.getItemname());
@@ -624,15 +701,21 @@
map.put("寮�鎴烽摱琛�", serviceFunddetailShared.getDepositbank());
map.put("鍗″彿", serviceFunddetailShared.getBankcardno());
map.put("鏀剁泭浜哄灞炴垨涓撳", serviceFunddetailShared.getBeneficiaryname());
- map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxamount());
+ map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxedamount());
map.put("浣滃簾鏈�缁堥噾棰�", null);
- String fpuuid = IdUtils.simpleUUID();
- map.put("鍙戠エ闄勪欢", fpuuid);
+ Long fpuuid = COUNTER.incrementAndGet();
+ map.put("鍙戠エ闄勪欢", "");
+ if (StringUtils.isNotEmpty(invoicefiles)) {
+ map.put("鍙戠エ闄勪欢", fpuuid);
+ }
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
- map.put("绋庨", null);
- String qtuuid = IdUtils.simpleUUID();
- map.put("鍏朵粬闄勪欢", qtuuid);
+ map.put("绋庨", serviceFunddetailShared.getTaxamount());
+ long qtuuid = COUNTER.incrementAndGet();
+ map.put("鍏朵粬闄勪欢", "");
+ if (StringUtils.isNotEmpty(annexfiles)) {
+ map.put("鍏朵粬闄勪欢", qtuuid);
+ }
map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode());
map.put("棰勭畻椤圭洰", null);
map.put("璐锋柟绉戠洰", null);
@@ -642,9 +725,6 @@
map.put("璐圭敤璇存槑", null);
list.add(map);
- //闄勪欢澶勭悊
- String annexfiles = serviceFunddetailShared.getAnnexfiles();
- String invoicefiles = serviceFunddetailShared.getInvoicefiles();
int i = 0;
if (StringUtils.isNotEmpty(annexfiles)) {
@@ -676,48 +756,85 @@
}
- private Map<String, Object> getformmain_0831(ServiceFundShared serviceFundShared) {
+ private Map<String, Object> getformmain_0831(ServiceFund serviceFund) {
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setFundid(serviceFund.getId());
+ serviceFundflow.setFundtype(2);
+ List<ServiceFundflow> serviceFundflows = serviceFundflowService.queryList(serviceFundflow);
+
Map<String, Object> formmain_0831 = new HashMap<>();
- formmain_0831.put("鎹愮尞鑰呭鍚�", serviceFundShared.getDonorname());
- formmain_0831.put("鎶ラ攢浜哄憳", serviceFundShared.getUsername());
- formmain_0831.put("涓氬姟鍖哄煙", serviceFundShared.getDeptmentname());
- formmain_0831.put("缁忔墜浜�", serviceFundShared.getUsername());
- formmain_0831.put("濉〃鏃堕棿", serviceFundShared.getApplyTime());
- formmain_0831.put("鎶ラ攢閲戦鍚堣", serviceFundShared.getPretaxcost());
+ formmain_0831.put("鎹愮尞鑰呭鍚�", serviceFund.getDonorname());
+ formmain_0831.put("鎶ラ攢浜哄憳", serviceFund.getUsername());
+ formmain_0831.put("涓氬姟鍖哄煙", serviceFund.getDeptmentname());
+ formmain_0831.put("缁忔墜浜�", serviceFund.getUsername());
+ formmain_0831.put("濉〃鏃堕棿", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceFund.getApplyTime()));
+ formmain_0831.put("鎶ラ攢閲戦鍚堣", serviceFund.getPretaxcost());
formmain_0831.put("涓婁紶闄勪欢", null);
formmain_0831.put("澶囨敞", null);
- formmain_0831.put("璐㈠姟瀹℃壒", serviceFundShared.getFinancechecher());
- formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", serviceFundShared.getFinancedirector());
- formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", serviceFundShared.getOfficedirector());
- formmain_0831.put("涓氬姟鍓櫌闀垮鎵�", serviceFundShared.getBusvicepresident());
- formmain_0831.put("璐㈠姟鍓櫌闀垮鎵�", serviceFundShared.getFinvicepresident());
- formmain_0831.put("涓績璐熻矗浜哄鎵�", serviceFundShared.getOpochecker());
- formmain_0831.put("鏀粯鏂瑰紡", serviceFundShared.getZffs());
- formmain_0831.put("缁勯暱", null);
- formmain_0831.put("瀹℃壒浜哄憳", null);
- formmain_0831.put("鏀粯鏃ユ湡", serviceFundShared.getRiqi());
+ formmain_0831.put("璐㈠姟瀹℃壒", null);
+ formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", getLastApprovalInfo(serviceFundflows, serviceFund.getFinancedirector()));
+
+// formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", "鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍛ㄨ偛鎴� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ if (serviceFund.getBackflowlevel() == 3)
+ formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍛ㄨ偛鎴� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ else formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, "鍛ㄨ偛鎴�"));
+
+ formmain_0831.put("涓氬姟鍓櫌闀垮鎵�", serviceFund.getBusvicepresident());
+ formmain_0831.put("璐㈠姟鍓櫌闀垮鎵�", serviceFund.getFinvicepresident());
+ formmain_0831.put("涓績璐熻矗浜哄鎵�", serviceFund.getOpochecker());
+ formmain_0831.put("鏀粯鏂瑰紡", serviceFund.getZffs());
+ formmain_0831.put("缁勯暱", getLastApprovalInfo(serviceFundflows, serviceFund.getManagername()));
+ formmain_0831.put("瀹℃壒浜哄憳", StringUtils.isEmpty(getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())) ? "闄堟厱鍗�" : getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher()));
+ formmain_0831.put("鏀粯鏃ユ湡", serviceFund.getRiqi());
formmain_0831.put("璇嗗埆浜�-浣滃簾", null);
- formmain_0831.put("璐㈠姟瀹℃壒绛惧瓧", serviceFundShared.getFinancedirector());
- formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉绛惧瓧", serviceFundShared.getFinancedirector());
- formmain_0831.put("琛ㄨ揪绫诲瀷", null);
- formmain_0831.put("绋庡墠閲戦鍚堣", serviceFundShared.getPretaxcost());
- formmain_0831.put("绋庨鍚堣", serviceFundShared.getPretaxcost() - serviceFundShared.getTaxedcost());
+ formmain_0831.put("璐㈠姟瀹℃壒绛惧瓧", serviceFund.getFinancedirector());
+ formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉绛惧瓧", serviceFund.getFinancedirector());
+ formmain_0831.put("琛ㄨ揪绫诲瀷", StringUtils.isEmpty(serviceFund.getApplytype()) ? null : ApplyTypeEnum.getDescByCode(serviceFund.getApplytype()));
+ formmain_0831.put("绋庡墠閲戦鍚堣", serviceFund.getPretaxcost());
+ formmain_0831.put("绋庨鍚堣", serviceFund.getPretaxcost() - serviceFund.getTaxedcost());
formmain_0831.put("琛ㄥ崟缂栧彿1", null);
formmain_0831.put("缂栫爜", null);
formmain_0831.put("CIF璐﹀閰嶇疆1", null);
formmain_0831.put(" 闄㈠尯", null);
- formmain_0831.put("鏄惁鏀粯", serviceFundShared.getIsdistribute());
+ formmain_0831.put("鏄惁鏀粯", serviceFund.getIsdistribute());
formmain_0831.put("鍑瘉鍙�", null);
formmain_0831.put("閾惰鍥炲崟", null);
formmain_0831.put("OFD", null);
formmain_0831.put("琛ㄥ崟闄勪欢", null);
formmain_0831.put("鐜伴噾娴侀噺鍒嗘瀽", null);
formmain_0831.put("鍑瘉绫诲埆", null);
- formmain_0831.put("绋庡悗閲戦鍚堣", serviceFundShared.getTaxedcost());
+ formmain_0831.put("绋庡悗閲戦鍚堣", serviceFund.getTaxedcost());
formmain_0831.put("鍘嗗彶瀹℃壒璁板綍", null);
- formmain_0831.put("琛ㄥ崟缂栧彿", serviceFundShared.getBh());
+ formmain_0831.put("琛ㄥ崟缂栧彿", serviceFund.getId());
formmain_0831.put("鍘嗗彶瀹℃壒鍗曟煡璇�", null);
return formmain_0831;
+ }
+
+
+ public String getLastApprovalInfo(List<ServiceFundflow> serviceFundflows, String managerName) {
+ log.info("---------------serviceFundflows鐨勫叆鍙備负锛歿},managerName鐨勫�间负锛歿}", serviceFundflows, managerName);
+ if (StringUtils.isEmpty(managerName)) return "";
+ if (CollectionUtils.isEmpty(serviceFundflows)) {
+ //濡傛灉鏄渶鍚庝竴涓汉瀹℃壒锛岃繖涓椂鍊欏彲鑳絝low閲岃繕娌℃湁鐢熸垚杩涘幓
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃";
+ }
+ //鍘讳竴涓嬬┖鏍�
+ String mn = managerName.trim();
+ Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> mn.trim().contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime));
+
+ if (lastApproval.isPresent()) {
+ ServiceFundflow flow = lastApproval.get();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (flow.getCheckTime() == null) {
+ flow.setCheckTime(new Date());
+ }
+ String formattedTime = sdf.format(flow.getCheckTime());
+
+ return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + formattedTime + " & 瀹℃壒缁撴灉锛氶�氳繃";
+ }
+
+ return "";
}
@Override
@@ -1530,18 +1647,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 +1681,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", "OPO绯荤粺");
+
+ 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;
}
@@ -1683,14 +1817,15 @@
serviceFundflow.setUpdateBy(serviceProcessVO.getCheckusername());
serviceFundflow.setCheckusername(serviceProcessVO.getCheckusername());
serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setUpdateTime(new Date());
serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
- serviceFundflow.setFlowconclusion(serviceProcessVO.getFlowconclusion());
- if (serviceProcessVO.getApplytype() == "0") serviceFundflow.setFundtype(1);
- if (serviceProcessVO.getApplytype() == "1") serviceFundflow.setFundtype(2);
+ serviceFundflow.setFlowconclusion(StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) ? Integer.valueOf(serviceProcessVO.getFlowconclusion()) : null);
+ if (serviceProcessVO.getApplytype().equals("0")) serviceFundflow.setFundtype(1);
+ if (serviceProcessVO.getApplytype().equals("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<>();
--
Gitblit v1.9.3