From 21bc49712f298f8c2619341279e7906dfb278944 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 28 七月 2023 19:53:07 +0800
Subject: [PATCH] 将操作记录插入fundflow表
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java | 2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 433 ++++++++++++++++++++++++++++++++++++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundflow.java | 48 +++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceFundflowMapper.xml | 71 ++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java | 44 +--
9 files changed, 519 insertions(+), 93 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
index 585d6f9..00ec114 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,15 +29,15 @@
/**
* 绯荤粺娑堟伅Controller
- *
+ *
* @author ruoyi
* @date 2022-06-02
*/
+@Slf4j
@Api("绯荤粺娑堟伅")
@RestController
@RequestMapping("/project/systemmessage")
-public class ServiceSystemmessageController extends BaseController
-{
+public class ServiceSystemmessageController extends BaseController {
@Autowired
private IServiceSystemmessageService serviceSystemmessageService;
@@ -45,8 +46,7 @@
*/
@ApiOperation("鏌ヨ绯荤粺娑堟伅鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceSystemmessage serviceSystemmessage)
- {
+ public TableDataInfo list(ServiceSystemmessage serviceSystemmessage) {
startPage();
List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
return getDataTable(list);
@@ -58,14 +58,15 @@
*/
@ApiOperation("鏌ヨ鏈娑堟伅鏁伴噺")
@GetMapping("/noreadcount")
- public AjaxResult noreadcount()
- {
- LoginUser loginUser = getLoginUser();
- ServiceSystemmessage serviceSystemmessage=new ServiceSystemmessage();
- serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
- serviceSystemmessage.setIsread(0);
- List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
- return AjaxResult.success(list.size());
+ public AjaxResult noreadcount() {
+// LoginUser loginUser = getLoginUser();
+// ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
+// serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
+// serviceSystemmessage.setIsread(0);
+// List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
+// return AjaxResult.success(list.size());
+ // log.info("涓嶇敤绠℃垜锛屾鍦ㄦ祴璇曠▼搴�");
+ return null;
}
/**
@@ -75,8 +76,7 @@
@PreAuthorize("@ss.hasPermi('project:systemmessage:export')")
@Log(title = "绯荤粺娑堟伅", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceSystemmessage serviceSystemmessage)
- {
+ public AjaxResult export(ServiceSystemmessage serviceSystemmessage) {
List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
ExcelUtil<ServiceSystemmessage> util = new ExcelUtil<ServiceSystemmessage>(ServiceSystemmessage.class);
return util.exportExcel(list, "绯荤粺娑堟伅鏁版嵁");
@@ -87,8 +87,7 @@
*/
@ApiOperation("鑾峰彇绯荤粺娑堟伅璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceSystemmessageService.getById(id));
}
@@ -100,8 +99,7 @@
@Log(title = "绯荤粺娑堟伅", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage)
- {
+ public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage) {
return toAjax(serviceSystemmessageService.save(serviceSystemmessage));
}
@@ -111,9 +109,8 @@
@ApiOperation("淇敼绯荤粺娑堟伅")
@Log(title = "绯荤粺娑堟伅", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceSystemmessage serviceSystemmessage)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceSystemmessage serviceSystemmessage) {
return toAjax(serviceSystemmessageService.updateById(serviceSystemmessage));
}
@@ -124,8 +121,7 @@
@PreAuthorize("@ss.hasPermi('project:systemmessage:remove')")
@Log(title = "绯荤粺娑堟伅", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceSystemmessageService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index 9d7034d..6d95371 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -267,5 +267,10 @@
@Excel(name = "璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
private String cxrjyj;
+ /**
+ * 瀹℃壒缁撴灉锛堚�滀腑蹇冪瀛椻�� 涓�1锛岃储鍔″壇闄㈤暱绛惧瓧涓�2锛屼笟鍔″壇闄㈤暱绛惧瓧涓�3锛変互鈥滐紝鈥濆垎寮�锛屽鏋�1锛�2锛�3閮芥湁浜嗭紝璇存槑杩欎釜瀹℃壒瀹屾垚浜�
+ */
+ @ApiModelProperty("瀹℃壒缁撴灉")
+ private int spjg;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundflow.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundflow.java
index d0b796a..3a51ba5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundflow.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundflow.java
@@ -8,64 +8,88 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
+
/**
* 璧勯噾瀹℃壒娴佺▼瀵硅薄 service_fundflow
- *
+ *
* @author ruoyi
* @date 2022-04-27
*/
@Data
@ApiModel("璧勯噾瀹℃壒娴佺▼")
-public class ServiceFundflow extends BaseEntity
-{
+public class ServiceFundflow extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 璐圭敤缂栧彿锛屽樊鏃呰垂鍏宠仈琛╯ervice_reimbursement ID; 璐圭敤鍏宠仈璐圭敤琛╯ervice_fund鐨処D */
+ /**
+ * 璐圭敤缂栧彿锛屽樊鏃呰垂鍏宠仈琛╯ervice_reimbursement ID; 璐圭敤鍏宠仈璐圭敤琛╯ervice_fund鐨処D
+ */
@ApiModelProperty("璐圭敤缂栧彿锛屽樊鏃呰垂鍏宠仈琛╯ervice_reimbursement ID; 璐圭敤鍏宠仈璐圭敤琛╯ervice_fund鐨処D")
@Excel(name = "璐圭敤缂栧彿锛屽樊鏃呰垂鍏宠仈琛╯ervice_reimbursement ID; 璐圭敤鍏宠仈璐圭敤琛╯ervice_fund鐨処D")
private Long fundid;
- /** 瀹℃牳浜虹紪鍙� */
+ /**
+ * 瀹℃牳浜虹紪鍙�
+ */
@ApiModelProperty("瀹℃牳浜虹紪鍙�")
@Excel(name = "瀹℃牳浜虹紪鍙�")
private String checkuserno;
- /** 瀹℃牳浜哄鍚� */
+ /**
+ * 瀹℃牳浜哄鍚�
+ */
@ApiModelProperty("瀹℃牳浜哄鍚�")
@Excel(name = "瀹℃牳浜哄鍚�")
private String checkusername;
- /** 娴佺▼鍐呭锛屾搷浣滃啓鎰忚寤鸿 */
+ /**
+ * 娴佺▼鍐呭锛屾搷浣滃啓鎰忚寤鸿
+ */
@ApiModelProperty("娴佺▼鍐呭锛屾搷浣滃啓鎰忚寤鸿")
@Excel(name = "娴佺▼鍐呭锛屾搷浣滃啓鎰忚寤鸿")
private String flowcontent;
- /** 娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱 */
+ /**
+ * 娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱
+ */
@ApiModelProperty("娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱")
@Excel(name = "娴佺▼缁撹 1锛氶�氳繃锛�2锛氶┏鍥烇紱")
private Integer flowconclusion;
- /** 璐圭敤绫诲埆 1锛氬樊鏃呰垂妯″潡 2锛氳垂鐢ㄧ敵璇锋ā鍧� */
+ /**
+ * 璐圭敤绫诲埆 1锛氬樊鏃呰垂妯″潡 2锛氳垂鐢ㄧ敵璇锋ā鍧�
+ */
@ApiModelProperty("璐圭敤绫诲埆 1锛氬樊鏃呰垂妯″潡 2锛氳垂鐢ㄧ敵璇锋ā鍧�")
@Excel(name = "璐圭敤绫诲埆 1锛氬樊鏃呰垂妯″潡 2锛氳垂鐢ㄧ敵璇锋ā鍧�")
private Integer fundtype;
- /** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
+ /**
+ * 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType
+ */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
@Excel(name = "璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
private String applytype;
- /** 瀹℃牳闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 瀹℃牳闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 999:閫氳繃
+ */
@ApiModelProperty("瀹℃牳闃舵")
@Excel(name = "瀹℃牳闃舵")
private Integer flowlevel;
+ @ApiModelProperty("鏍￠獙鏃堕棿")
+ @Excel(name = "鏍￠獙鏃堕棿")
+ private Date checkTime;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index cd2be12..419a642 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -358,5 +358,8 @@
@ApiModelProperty("浠樻鏃ユ湡")
private String riqi;
+
+ @ApiModelProperty("瀹℃壒缁撴灉")
+ private Integer spjg;
}
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 b6b850a..8cd6441 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
@@ -70,6 +70,9 @@
if (StringUtils.isNotBlank(serviceFund.getDonorno())) {
wrappers.eq(ServiceFund::getDonorno, serviceFund.getDonorno());
}
+ if (serviceFund.getId() != null) {
+ wrappers.eq(ServiceFund::getId, serviceFund.getId());
+ }
if (StringUtils.isNotBlank(serviceFund.getUserno())) {
wrappers.eq(ServiceFund::getUserno, serviceFund.getUserno());
}
@@ -643,6 +646,7 @@
return count;
}
+
int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
//涓婁紶OA鏂囦欢
//String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
index 94c632c..8b6321f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
@@ -175,7 +175,7 @@
public List<ServiceFundShared> queryFundShareList() {
LambdaQueryWrapper<ServiceFundShared> wrappers = Wrappers.lambdaQuery();
wrappers.eq(ServiceFundShared::getDel_flag, 0);
- wrappers.isNotNull(ServiceFundShared::getCxrjyj);
+ // wrappers.isNotNull(ServiceFundShared::getCxrjyj);
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
index a8fb075..3afa62a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
@@ -165,7 +165,7 @@
public List<ServiceReimbursementShared> queryReShareList() {
LambdaQueryWrapper<ServiceReimbursementShared> wrappers = Wrappers.lambdaQuery();
wrappers.eq(ServiceReimbursementShared::getDelFlag, 0);
- wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj);
+ // wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj);
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundflowMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundflowMapper.xml
index 5cc3e52..da421c5 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundflowMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundflowMapper.xml
@@ -1,40 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFundflowMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceFundflow" id="ServiceFundflowResult">
- <result property="id" column="ID" />
- <result property="fundid" column="FundID" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="checkuserno" column="CheckUserNo" />
- <result property="checkusername" column="CheckUserName" />
- <result property="flowcontent" column="FlowContent" />
- <result property="flowconclusion" column="FlowConclusion" />
- <result property="fundtype" column="FundType" />
- <result property="applytype" column="ApplyType" />
- <result property="flowlevel" column="FlowLevel" />
+ <result property="id" column="ID"/>
+ <result property="fundid" column="FundID"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="checkuserno" column="CheckUserNo"/>
+ <result property="checkusername" column="CheckUserName"/>
+ <result property="flowcontent" column="FlowContent"/>
+ <result property="flowconclusion" column="FlowConclusion"/>
+ <result property="fundtype" column="FundType"/>
+ <result property="applytype" column="ApplyType"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="checkTime" column="check_time"/>
</resultMap>
<sql id="selectServiceFundflowVo">
- select ID, FundID, del_flag, create_by, create_time, update_by, update_time, CheckUserNo, CheckUserName, FlowContent, FlowConclusion, FundType, ApplyType,FlowLevel from service_fundflow
+ select ID,
+ FundID,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ CheckUserNo,
+ CheckUserName,
+ FlowContent,
+ FlowConclusion,
+ FundType,
+ ApplyType,
+ FlowLevel,
+ checkTime
+ from service_fundflow
</sql>
- <select id="selectServiceFundflowList" parameterType="com.ruoyi.project.domain.ServiceFundflow" resultMap="ServiceFundflowResult">
+ <select id="selectServiceFundflowList" parameterType="com.ruoyi.project.domain.ServiceFundflow"
+ resultMap="ServiceFundflowResult">
<include refid="selectServiceFundflowVo"/>
<where>
- <if test="fundid != null "> and FundID = #{fundid}</if>
- <if test="checkuserno != null and checkuserno != ''"> and CheckUserNo = #{checkuserno}</if>
- <if test="checkusername != null and checkusername != ''"> and CheckUserName like concat('%', #{checkusername}, '%')</if>
- <if test="flowcontent != null and flowcontent != ''"> and FlowContent = #{flowcontent}</if>
- <if test="flowconclusion != null "> and FlowConclusion = #{flowconclusion}</if>
- <if test="fundtype != null "> and FundType = #{fundtype}</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
+ <if test="fundid != null ">and FundID = #{fundid}</if>
+ <if test="checkuserno != null and checkuserno != ''">and CheckUserNo = #{checkuserno}</if>
+ <if test="checkusername != null and checkusername != ''">and CheckUserName like concat('%',
+ #{checkusername}, '%')
+ </if>
+ <if test="flowcontent != null and flowcontent != ''">and FlowContent = #{flowcontent}</if>
+ <if test="flowconclusion != null ">and FlowConclusion = #{flowconclusion}</if>
+ <if test="fundtype != null ">and FundType = #{fundtype}</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
</where>
</select>
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 3d99b13..e7deb39 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
@@ -4,12 +4,16 @@
import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.*;
import com.ruoyi.project.service.impl.DingTalkServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
+import org.springframework.util.CollectionUtils;
import java.lang.reflect.Array;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -19,6 +23,7 @@
* @author ruoyi
*/
@Component("ryTask")
+@Slf4j
public class RyTask {
@Autowired
private DingTalkService dingTalkService;
@@ -55,48 +60,418 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- String[] split = serviceFundShared.getCxrjyj().split("&");
- String phone = serviceFundShared.getPhone();
- //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
+ if (StringUtils.isNotBlank(serviceFundShared.getCxrjyj())) {
+ //濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
+ String[] split = serviceFundShared.getCxrjyj().split("&");
+ String phone = serviceFundShared.getPhone();
+ //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
+ serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
- ServiceFund serviceFund = new ServiceFund();
- serviceFund.setId(serviceFundShared.getSerfunid());
- List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
- ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(0);
- serviceFund1.setDel_flag(0);
- serviceFund1.setBackflowlevel(199);
- serviceFundService.updateById(serviceFund1);
- sendMeg(split, phone,serviceFundShared.getApplytype(),2,serviceFundShared.getSerfunid());
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+ ServiceFund serviceFund1 = serviceFunds.get(0);
+ serviceFund1.setFlowlevel(0);
+ serviceFund1.setDel_flag(0);
+ serviceFund1.setBackflowlevel(199);
+ serviceFundService.updateById(serviceFund1);
+ sendMeg(split, phone, serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
+ } else {
+ //涓嶆槸閫�鍥炵殑鎿嶄綔
+ if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 0) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ serviceFund.setZffs(serviceFundShared.getZffs());
+ if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
+ serviceFund.setOpochecker(serviceFundShared.getOpochecker());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
+ }
+
+ boolean b = serviceFundService.updateById(serviceFund);
+ log.info("鏇存柊serviceFund閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ //鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
+ String spname = "";
+ if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getOpochecker().substring(serviceFundShared.getOpochecker().indexOf(" ") + 1, serviceFundShared.getOpochecker().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getOpochecker() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getFinvicepresident().substring(serviceFundShared.getFinvicepresident().indexOf(" ") + 1, serviceFundShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getFinvicepresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getBusvicepresident().substring(serviceFundShared.getBusvicepresident().indexOf(" ") + 1, serviceFundShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getBusvicepresident() + " ";
+ }
+ serviceFundflow.setFlowcontent(spname + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ // 999 閫氳繃
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+ //灏嗗鎵圭姸鎬佹敼鎴�1
+ serviceFundSharedService.updateById(serviceFundShared);
+
+ } else if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 1) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�1锛屽鎵圭粨鏉�,灏变笉绠￠偅浜涢瀵兼槸鍚︾瀛椾簡
+ continue;
+ }
+
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+ if (!CollectionUtils.isEmpty(serviceFunds)) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+
+
+ if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getOpochecker())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getOpochecker().substring(serviceFundShared.getOpochecker().indexOf(" ") + 1, serviceFundShared.getOpochecker().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFund.setOpochecker(serviceFundShared.getOpochecker());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getFinvicepresident().substring(serviceFundShared.getFinvicepresident().indexOf(" ") + 1, serviceFundShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Finvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getFinvicepresident())) {
+ serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getBusvicepresident().substring(serviceFundShared.getBusvicepresident().indexOf(" ") + 1, serviceFundShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Busvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getBusvicepresident())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")) + "閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ }
+ }
}
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- String phone = serviceReimbursementShared.getPhone();
- String[] split = serviceReimbursementShared.getCxrjyj().split("&");
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ String phone = serviceReimbursementShared.getPhone();
+ String[] split = serviceReimbursementShared.getCxrjyj().split("&");
- //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
+ //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
+ serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
- //灏咶lowlevel 璁剧疆涓�0;
- ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
- serviceReimbursement.setId(serviceReimbursementShared.getReimid());
- List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
- ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
- serviceReimbursement1.setFlowlevel(0L);
- serviceReimbursement1.setDelFlag(0);
- serviceReimbursement1.setBackflowlevel(199L);
- serviceReimbursement1.setRecordstatus(-1);
- serviceReimbursementService.updateById(serviceReimbursement1);
- sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
+ //灏咶lowlevel 璁剧疆涓�0;
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setId(serviceReimbursementShared.getReimid());
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
+ ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
+ serviceReimbursement1.setFlowlevel(0L);
+ serviceReimbursement1.setDelFlag(0);
+ serviceReimbursement1.setBackflowlevel(199L);
+ serviceReimbursement1.setRecordstatus(-1);
+ serviceReimbursementService.updateById(serviceReimbursement1);
+ sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
+ } else {
+ //涓嶆槸閫�鍥炵殑鎿嶄綔
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg() == 0) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setId(serviceReimbursementShared.getReimid());
+ serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
+ serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
+ }
+ boolean b = serviceReimbursementService.updateById(serviceReimbursement);
+ log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ //鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
+ String spName = "";
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getOpochecker().substring(serviceReimbursementShared.getOpochecker().indexOf(" ") + 1, serviceReimbursementShared.getOpochecker().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getOpochecker() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getFinvicepresident().substring(serviceReimbursementShared.getFinvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getFinvicepresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getBusvicepresident().substring(serviceReimbursementShared.getBusvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getBusvicepresident() + " ";
+ }
+ serviceFundflow.setFlowcontent(spName + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ // 999 閫氳繃
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+
+ serviceReimbursementShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+ serviceReimbursementSharedService.updateById(serviceReimbursementShared);
+
+ } else if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg().equals("1")) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�1锛屽鎵圭粨鏉�,灏变笉绠￠偅浜涢瀵兼槸鍚︾瀛椾簡
+ continue;
+ }
+
+ ServiceReimbursement reimbursement = new ServiceReimbursement();
+ reimbursement.setId(serviceReimbursementShared.getReimid());
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(reimbursement);
+ if (!CollectionUtils.isEmpty(serviceReimbursementList)) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getOpochecker().substring(serviceReimbursementShared.getOpochecker().indexOf(" ") + 1, serviceReimbursementShared.getOpochecker().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
+ reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getFinvicepresident().substring(serviceReimbursementShared.getFinvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Finvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getFinvicepresident())) {
+ reimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setCheckTime(parse);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getBusvicepresident().substring(serviceReimbursementShared.getBusvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Busvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getBusvicepresident())) {
+ reimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setCheckTime(parse);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ }
+ }
}
-
}
+
public void sendMeg(String[] split, String phone, String applyType, Integer fundType, Long fundId) {
//璁板綍鎿嶄綔璁板綍
ServiceFundflow serviceFundflow = new ServiceFundflow();
--
Gitblit v1.9.3