From d5c2c0762ccbb2bb33635f99480d404f1fb10d5a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 22 二月 2024 18:26:29 +0800
Subject: [PATCH] 修改流程代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 6 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 14 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 211 ++++++++++++++++++-----------------------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 9 +
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 8 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 9 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 9 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 3
9 files changed, 143 insertions(+), 129 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 e1a99fb..baa29cf 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
@@ -530,7 +530,8 @@
if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
- serviceFundService.addFundSharedInfo(serviceFund.getId());
+// serviceFundService.addFundSharedInfo(serviceFund.getId());
+ serviceFund.setFlowlevel(3L);
serviceFund.setFlowlevel(100L);
serviceFund.setRecordstatus(99);
serviceFundService.updateById(serviceFund);
@@ -616,9 +617,9 @@
//閫氳繃
serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
- if (TotalLevel == OriginalFlowLevel + 1) {
- serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
- }
+// if (TotalLevel == OriginalFlowLevel + 1) {
+// serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
+// }
} else {
//椹冲洖
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index a2e7c0e..dff0ba6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -370,7 +370,9 @@
if (serviceReimbursement.getFlowlevel() == 1 && serviceReimbursement.getBackflowlevel() == 100) {
log.info("鍑哄樊琛ヨ创琚� 璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�:{}", serviceReimbursement.getId());
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
- serviceReimbursementService.addSharedData(serviceReimbursement.getId());
+// serviceReimbursementService.addSharedData(serviceReimbursement.getId());
+
+ serviceReimbursement.setFlowlevel(3L);
serviceReimbursement.setFlowlevel(100L);
serviceReimbursement.setRecordstatus(99);
boolean b = serviceReimbursementService.updateById(serviceReimbursement);
@@ -471,10 +473,12 @@
serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceReimbursement.getDonorname() + "銆戠殑宸梾璐圭敵璇峰凡閫氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
log.info("totalLevel鐨勫�� : {}, OriginalFlowLevel鐨勫��:{}", totalLevel, OriginalFlowLevel);
- if (totalLevel == OriginalFlowLevel + 1) {
- //鎵�鏈夋暟鎹柊澧炲埌澶囦唤琛�
- serviceReimbursementService.addSharedData(checkFundVO.getFundid());
- }
+
+ //杩欎竴鍧楁斁瀹氭椂浠诲姟閲屽仛
+// if (totalLevel == OriginalFlowLevel + 1) {
+// //鎵�鏈夋暟鎹柊澧炲埌澶囦唤琛�
+// serviceReimbursementService.addSharedData(checkFundVO.getFundid());
+// }
} else {
//椹冲洖
serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
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 0af5e04..bbac545 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
@@ -362,5 +362,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婃姤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
+
+ @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬惁 1锛氭槸")
+ private Integer uploadStates = 0;
+
+ /**
+ * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+ */
+ @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
+ private String notes;
}
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 a2dadb9..c05041d 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
@@ -328,6 +328,12 @@
private String bh;
/**
+ * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+ */
+ @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
+ private String notes;
+
+ /**
* 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
*/
@ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
@@ -348,5 +354,8 @@
// @ApiModelProperty("缁撴潫鏃堕棿")
// private Date endtime;
+ @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬惁 1锛氭槸")
+ private Integer uploadStates = 0;
+
}
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 320da0b..758c8cc 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
@@ -109,6 +109,9 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getUploadStates() != null) {
+ wrappers.eq(ServiceFund::getUploadStates, serviceFund.getUploadStates());
+ }
if (serviceFund.getFlowlevel() != null) {
wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
}
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 ae593c3..a44e772 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
@@ -100,6 +100,9 @@
if (serviceReimbursement.getRecordstatus() != null) {
wrappers.eq(ServiceReimbursement::getRecordstatus, serviceReimbursement.getRecordstatus());
}
+ if (serviceReimbursement.getUploadStates() != null) {
+ wrappers.eq(ServiceReimbursement::getUploadStates, serviceReimbursement.getUploadStates());
+ }
if (StringUtils.isNotBlank(serviceReimbursement.getUploadflag())) {
wrappers.eq(ServiceReimbursement::getUploadflag, serviceReimbursement.getUploadflag());
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index b99d1e7..fcafa95 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -60,7 +60,9 @@
<result property="istax" column="istax"/>
<result property="fundtaxtime" column="fundtaxtime"/>
<result property="applyTime" column="apply_time"/>
-
+ <result property="applyTime" column="apply_time"/>
+ <result property="uploadStates" column="upload_states"/>
+ <result property="notes" column="notes"/>
</resultMap>
<sql id="selectServiceFundVo">
@@ -119,7 +121,9 @@
performancetype,
istax,
apply_time,
- fundtaxtime
+ fundtaxtime,
+ upload_states,
+ notes
from service_fund
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 466fb65..cf33948 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -63,6 +63,8 @@
<result property="checkstatus" column="checkstatus"/>
<result property="performancetype" column="performancetype"/>
<result property="applyTime" column="apply_time"/>
+ <result property="uploadStates" column="upload_states"/>
+ <result property="notes" column="notes"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -121,7 +123,9 @@
bh,
checkstatus,
apply_time,
- performancetype
+ performancetype,
+ upload_states,
+ notes
from service_reimbursement
</sql>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 3661bc7..2f6df59 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -41,23 +41,10 @@
private IServiceFundSharedService serviceFundSharedService;
@Autowired
- private IServiceFunddetailSharedService serviceFunddetailSharedService;
-
+ private IServiceFundflowruleService iServiceFundflowruleService;
@Autowired
- private IServiceFunddetailService serviceFunddetailService;
-
- @Autowired
- private IServiceReimbursementdetailService serviceReimbursementdetailService;
-
- @Autowired
- private IServiceReimbursementdetailSharedService reimbursementdetailSharedService;
-
- @Autowired
private IServiceFundService serviceFundService;
-
-// @Autowired
-// private IServiceReimbursementService serviceReimbursementService;
@Autowired
@@ -74,109 +61,6 @@
public void ryNoParams() {
System.out.println("鎵ц鏃犲弬鏂规硶");
}
-
-// public void checkDBInfo() {
-// ServiceFund serviceFund = new ServiceFund();
-// serviceFund.setFlowlevel(3L);
-// List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
-// for (ServiceFund serviceFund1 : serviceFunds) {
-// ServiceFundShared serviceFundShared = new ServiceFundShared();
-// serviceFundShared.setSerfunid(serviceFund1.getId());
-// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
-// if (CollectionUtils.isEmpty(serviceFundShareds)) {
-// ServiceFundShared serviceFundShared1 = DtoConversionUtils.sourceToTarget(serviceFund1, ServiceFundShared.class);
-// serviceFundShared1.setSerfunid(serviceFund1.getId());
-// serviceFundShared1.setId(null);
-// serviceFundSharedService.save(serviceFundShared1);
-// }
-// }
-// //FUND
-// List<ServiceFunddetail> serviceFunddetailnew = new ArrayList<>();
-// List<ServiceFunddetail> serviceFunddetails = serviceFunddetailService.queryList(new ServiceFunddetail());
-// for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
-//// if (!ObjectUtils.isEmpty(serviceFunddetail.getAnnexfiles())) {
-//// serviceFunddetailnew.add(serviceFunddetail);
-//// } else {
-// Long fundid = serviceFunddetail.getFundid();
-// ServiceFund byId = serviceFundService.getById(fundid);
-// if (!ObjectUtils.isEmpty(byId)) {
-// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
-// serviceFunddetailnew.add(serviceFunddetail);
-// }
-//// }
-// }
-// }
-// for (ServiceFunddetail serviceFunddetail1 : serviceFunddetailnew) {
-// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑fdid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
-// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
-// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
-// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
-// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
-// serviceFundService.addFundSharedInfo(serviceFunddetail1.getFundid());
-// }
-//// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
-//// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
-//// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
-//// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
-//// ServiceFunddetailShared serviceFunddetailShared1 = DtoConversionUtils.sourceToTarget(serviceFunddetail1, ServiceFunddetailShared.class);
-//// serviceFunddetailShared1.setId(null);
-//// ServiceFundShared serviceFundShared = new ServiceFundShared();
-//// serviceFundShared.setSerfunid(serviceFunddetail1.getFundid());
-//// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
-//// serviceFunddetailShared1.setFundid(serviceFundShareds.get(0).getId());
-//// serviceFunddetailShared1.setFdid(serviceFunddetail1.getId());
-//// serviceFunddetailSharedService.save(serviceFunddetailShared1);
-//// }
-// }
-//
-//
-// //reimbursement
-// List<ServiceReimbursementdetail> serviceReimbursementdetailsNew = new ArrayList<>();
-// List<ServiceReimbursementdetail> serviceReimbursementdetails = serviceReimbursementdetailService.queryList(new ServiceReimbursementdetail());
-// for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetails) {
-//// if (!ObjectUtils.isEmpty(reimbursementdetail.getAnnexfiles())) {
-//// serviceReimbursementdetailsNew.add(reimbursementdetail);
-//// } else {
-// Long rbid = reimbursementdetail.getRbid();
-// ServiceReimbursement byId = serviceReimbursementService.getById(rbid);
-// if (!ObjectUtils.isEmpty(byId)) {
-// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
-// serviceReimbursementdetailsNew.add(reimbursementdetail);
-// }
-//// }
-// }
-// }
-// for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetailsNew) {
-// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑rbid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
-// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
-// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
-// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
-// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
-// serviceReimbursementService.addSharedData(serviceReimbursementdetail.getRbid());
-// }
-// }
-//// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
-//// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
-//// if (serviceReimbursementdetail.getRbid() == 872) {
-//// System.out.println("-------------------");
-//// }
-//// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
-////
-//// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
-//// ServiceReimbursementdetailShared reimbursementdetailShared = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailShared.class);
-//// reimbursementdetailShared.setId(null);
-//// ServiceReimbursementShared serviceReimbursementShared = new ServiceReimbursementShared();
-//// serviceReimbursementShared.setReimid(serviceReimbursementdetail.getRbid());
-//// List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryList(serviceReimbursementShared);
-//// if (!CollectionUtils.isEmpty(serviceReimbursementShareds) && !ObjectUtils.isEmpty(serviceReimbursementShareds.get(0))) {
-//// reimbursementdetailShared.setRbid(serviceReimbursementShareds.get(0).getId());
-//// reimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
-//// reimbursementdetailSharedService.save(reimbursementdetailShared);
-//// }
-//// }
-//// }
-//
-// }
public void checkReportInfo() {
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
@@ -424,6 +308,7 @@
ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
serviceReimbursement1.setFlowlevel(100L);
serviceReimbursement1.setDelFlag(0);
+ serviceReimbursement1.setUploadStates(0);
serviceReimbursement1.setBackflowlevel(199L);
serviceReimbursement1.setRecordstatus(-1);
serviceReimbursementService.updateById(serviceReimbursement1);
@@ -706,4 +591,96 @@
}
+ /**
+ * 灏嗘暟鎹瓨鍒板垎浜〃涓�
+ */
+ public void addDataShared() {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ //澶勭悊宸梾鎶ラ攢
+ serviceFundflowrule.setApplytype("0");
+ List<ServiceFundflowrule> serviceFundflowrules = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("宸梾鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules.get(0).getTotallevel());
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
+ serviceReimbursement.setUploadStates(0);
+ serviceReimbursement.setDelFlag(0);
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
+ for (ServiceReimbursement serviceReimbursement1 : serviceReimbursementList) {
+ try {
+ log.info("鎻掑叆鍒嗕韩琛ㄧ殑ID涓猴細{}", serviceReimbursement1.getId());
+ Boolean aBoolean = serviceReimbursementService.addSharedData(serviceReimbursement1.getId());
+ if (aBoolean) {
+ ServiceReimbursement serviceReimbursement3 = new ServiceReimbursement();
+ serviceReimbursement3.setId(serviceReimbursement1.getId());
+ serviceReimbursement3.setUploadStates(1);
+ boolean b = serviceReimbursementService.updateById(serviceReimbursement3);
+ log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
+ }
+ } catch (Exception e) {
+ ServiceReimbursement serviceReimbursement2 = new ServiceReimbursement();
+ serviceReimbursement2.setId(serviceReimbursement1.getId());
+ serviceReimbursement2.setNotes("鎻掑叆鍒嗕韩琛ㄥけ璐�");
+ serviceReimbursementService.updateById(serviceReimbursement2);
+ }
+ }
+
+ //涓撳鍔冲姟璐圭敵璇�
+ serviceFundflowrule.setApplytype("1");
+ List<ServiceFundflowrule> serviceFundflowrules2 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("涓撳鍔冲姟鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules2.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1");
+
+ //浼︾悊涓撳鍔冲姟璐圭敵璇�
+ serviceFundflowrule.setApplytype("2");
+ List<ServiceFundflowrule> serviceFundflowrules3 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("浼︾悊涓撳鍔冲姟璐圭敵璇�:{}", serviceFundflowrules3.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2");
+
+ //鍖诲鎴愭湰鎶ラ攢
+ serviceFundflowrule.setApplytype("3");
+ List<ServiceFundflowrule> serviceFundflowrules4 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍖诲鎴愭湰鎶ラ攢:{}", serviceFundflowrules4.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3");
+
+ //鍔炲叕璐圭敤鎶ラ攢
+ serviceFundflowrule.setApplytype("4");
+ List<ServiceFundflowrule> serviceFundflowrules5 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules5.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4");
+
+ //缁╂晥瀹℃壒鎶ラ攢
+ serviceFundflowrule.setApplytype("5");
+ List<ServiceFundflowrule> serviceFundflowrules6 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules6.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5");
+
+ }
+
+ private void addFunfShared(Long totallevel, String applyType) {
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setFlowlevel(totallevel);
+ serviceFund.setUploadStates(0);
+ serviceFund.setDel_flag(0);
+ serviceFund.setApplytype(applyType);
+ List<ServiceFund> serviceFundList = serviceFundService.queryList(serviceFund);
+ for (ServiceFund serviceFund1 : serviceFundList) {
+ try {
+ log.info("鎻掑叆鍒嗕韩琛ㄧ殑FundID涓猴細{}", serviceFund1.getId());
+ Boolean aBoolean = serviceFundService.addFundSharedInfo(serviceFund1.getId());
+ if (aBoolean) {
+ ServiceFund serviceFund2 = new ServiceFund();
+ serviceFund2.setId(serviceFund1.getId());
+ serviceFund2.setUploadStates(1);
+ boolean b = serviceFundService.updateById(serviceFund2);
+ log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
+ }
+ } catch (Exception e) {
+ ServiceFund serviceFund2 = new ServiceFund();
+ serviceFund2.setId(serviceFund1.getId());
+ serviceFund2.setNotes("鎻掑叆fund鍒嗕韩琛ㄥけ璐�");
+ serviceFundService.updateById(serviceFund2);
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3