From 554570a87127544843d4f99da13a5a5450559c1b Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 20:55:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=AD=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 16 ---------------- .../service/impl/WxFlowServiceImpl.java | 8 +++----- .../impl/WxRentContractServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index eceab6c9a..c2e7cbc85 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -20,7 +20,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.*; @RestController @@ -31,8 +30,6 @@ public class WxFlowAbleController extends BaseController { @Autowired private WxFlowService wxFlowService; -// @Autowired -// RuntimeService runtimeService; @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @PostMapping("/start") @@ -43,19 +40,6 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.start(params, user.getId(),user.getName(),user.getTenantId()); } - /** - * 删除流程 - */ -// @GetMapping(value = "/del") -// public ResultData del(String id,String x) { -// if("xll1dxx1314".equals(x)) { -// runtimeService.deleteProcessInstance(id, "驳回"); -// return new ResultData(); -// }else{ -// return new ResultData("fail"); -// } -// } - /** * 用户代办列表 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 3c02a554a..eaaedca00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -225,7 +225,6 @@ public class WxFlowServiceImpl implements WxFlowService { map.put(userTaskVo.getKey()+"_signAssignee",assigneeList); } } - } @Override @@ -619,7 +618,7 @@ public class WxFlowServiceImpl implements WxFlowService { } } } - // 设置最后一个发起节点 + // 只展示最后一次发起,设置最后一个发起节点 if(CollectionUtils.isNotEmpty(resultList)){ for (int i = 0; i < resultList.size() ; i++) { if(resultList.get(i).getStatus() == 1){ @@ -630,12 +629,11 @@ public class WxFlowServiceImpl implements WxFlowService { } } - // 合并会签节点展 + // 合并会签节点展示 Map map = new LinkedHashMap<>(); for (WxFlowRecord r:resultList) { - if(r.getTaskKey() == null){ + if(r.getTaskKey() == null) r.setTaskKey(r.getTaskName()); - } WxFlowRecord mapR = map.get(r.getTaskKey()); if(mapR != null) mapR.setUserName(mapR.getUserName()+","+r.getUserName()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b6049d1a2..0f867ee71 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1956,6 +1956,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { diff = DateUtils.getDiff(start,currEnd); total = (diff[1]+1) * price; + int warnCount = 0; while (true){ Date monthStartDate = DateUtils.getDaySet(currEnd,Calendar.DATE,1); dayCount = DateUtils.getMonthDayCount(monthStartDate); @@ -1975,6 +1976,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { diff = DateUtils.getDiff(monthStartDate,currEnd); total += price * (diff[1] +1); } + + //预警 + if(warnCount >= 1000){ + Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); + logger.error("getNeedPay() warnCount max error !!!"); + break; + } + warnCount ++; } return total; } @@ -1982,6 +1991,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public static List initBillTimeList(Date start,Date end,Integer adjustPeriod,Integer dayType,int receivePeriod){ List list = new ArrayList<>(); + int warnCount = 0; int count = 0; while (true){ BillTimeVo timeVo = new BillTimeVo(); @@ -2034,6 +2044,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { break; } count ++; + + //预警 + if(warnCount >= 1000){ + Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); + logger.error("initBillTimeList() warnCount max error !!!"); + break; + } + warnCount ++; } return list; }