From 83ddf7cc917256254a8e2f14af235f9edfd30ade Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 19 Apr 2019 13:41:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxFlowAbleController.java | 17 +++++++++++++ .../db/migration/V201904191333__ADD_FLOW.sql | 5 ++++ .../com/iformall/domain/po/WxFlowRecord.java | 24 +++++++++++++++++++ .../com/iformall/mapper/WxBillAllMapper.java | 6 +++++ .../iformall/mapper/WxFlowRecordMapper.java | 4 ++++ .../com/iformall/service/WxFlowService.java | 7 ++++++ .../service/impl/WxFlowServiceImpl.java | 21 +++++++++++++++- .../resources/mapper/WxFlowRecordMapper.xml | 9 ++++++- 8 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index a028de0a4..0704cd3d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -81,6 +81,23 @@ public class WxFlowAbleController extends BaseController { return new ResultData(wxFlowService.listAsPage(record,pageNum,pageSize)); } + /** + * 我的审批列表 + */ + @ApiOperation("我的审批列表") + @GetMapping(value = "/myHandleList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "工作流-我的审批列表") + public ResultData myHandleList(@ModelAttribute WxFlowRecord record, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] FlowAbleController::myHandelList"); + record.setUserId(super.getUser().getId()); + record.setStatus(EnumFlowRecordStatus.NEW.getCode()); + return new ResultData(wxFlowService.myHandelList(record,pageNum,pageSize)); + } + /** * 审批历史 diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql new file mode 100644 index 000000000..e594341b3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql @@ -0,0 +1,5 @@ + + + +ALTER TABLE `wx_flow_record` +ADD COLUMN `start_date` DATETIME COMMENT '发起时间'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index be494c6ce..f0b1747fb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -39,6 +39,30 @@ public class WxFlowRecord implements Serializable { //是否最后一个启动节点 @Transient private Integer isLastStart; + //申请时间 + private Date startDate; + @Transient + private Integer limit; + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } public WxFlowRecord(){} public WxFlowRecord(Long businessId){ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 7e89b894c..1790beb4c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -35,4 +35,10 @@ public interface WxBillAllMapper { * @return */ List> getWaitPayBillForEmail(); + + /** + * 欠缴商户分页列表 + * @return + */ + List> getOweBillAsPage(WxBillAll record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java index 26d00aa9b..6a3e0b6b4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java @@ -9,4 +9,8 @@ public interface WxFlowRecordMapper extends CommonMapper { List findList(WxFlowRecord flowRecord); void updateCurrStatus(WxFlowRecord record); + + List myHandelList(WxFlowRecord flowRecord); + + Integer myHandelListTotal(WxFlowRecord flowRecord); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index e2f52727b..f80c639c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -81,4 +81,11 @@ public interface WxFlowService { * @return */ PageInfo listAsPage(WxFlowRecord record, Integer pageIndex, Integer pageSize); + + /** + * 我的审批 + * @param pageSize + * @return + */ + PageInfo myHandelList(WxFlowRecord record, Integer pageIndex, Integer pageSize); } 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 de7fc6823..0c873aeee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -321,9 +321,11 @@ public class WxFlowServiceImpl implements WxFlowService { map.put(taskAssigneeMap.get("taskKey"), taskAssigneeMap.get("assignee")); } // map info,设置发起人等信息 + Date startDate = new Date(); MallUserInfo starterInfo = this.mallUserInfoService.getById(userId); map.put("starter", mallUserInfoToMap(starterInfo)); - map.put("startTime", System.currentTimeMillis()); + map.put("startTime", startDate.getTime()); + map.put("startDate", startDate); map.put("businessId",businessId+""); map.put("flowType",flowType); map.put("taskAssignee",taskAssignee); @@ -348,6 +350,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setTaskName("发起"); wxFlowRecord.setCurrStatus(EnumRentContractAppStatus.APPLYING.getCode()); wxFlowRecord.setVariables(variablesToJson(variables)); + wxFlowRecord.setStartDate(startDate); wxFlowRecordService.saveOrUpdate(wxFlowRecord); // 给审批人发送代办通知短信 @@ -605,6 +608,8 @@ public class WxFlowServiceImpl implements WxFlowService { Map mapInfo = taskService.getVariables(task.getId()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); + List> variables = (List)mapInfo.get("variables"); + Date startDate = (Date)mapInfo.get("startDate"); taskService.complete(taskId); //保存wx_flow_record表审批记录 @@ -619,6 +624,8 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName); wxFlowRecord.setTaskName(taskName); wxFlowRecord.setTaskKey(taskKey); + wxFlowRecord.setVariables(variablesToJson(variables)); + wxFlowRecord.setStartDate(startDate); wxFlowRecordService.saveOrUpdate(wxFlowRecord); // 判断流程是否结束,并发送短信通知 @@ -762,6 +769,7 @@ public class WxFlowServiceImpl implements WxFlowService { Map userMap = (Map)mapInfo.get("starter"); String email = (String) userMap.get("email"); List> variables = (List)mapInfo.get("variables"); + Date startDate = (Date)mapInfo.get("startDate"); String taskName; String taskKey; @@ -789,6 +797,8 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName); wxFlowRecord.setTaskKey(taskKey); wxFlowRecord.setTaskName(taskName); + wxFlowRecord.setVariables(variablesToJson(variables)); + wxFlowRecord.setStartDate(startDate); wxFlowRecordService.saveOrUpdate(wxFlowRecord); //修改记录表当前状态 wxFlowRecordMapper.updateCurrStatus(new WxFlowRecord(processInstanceId,EnumRentContractAppStatus.REJECT.getCode())); @@ -839,6 +849,8 @@ public class WxFlowServiceImpl implements WxFlowService { Map mapInfo = taskService.getVariables(task.getId()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); + List> variables = (List)mapInfo.get("variables"); + Date startDate = (Date)mapInfo.get("startDate"); String taskName; String taskKey; @@ -866,6 +878,8 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName); wxFlowRecord.setTaskKey(taskKey); wxFlowRecord.setTaskName(taskName); + wxFlowRecord.setVariables(variablesToJson(variables)); + wxFlowRecord.setStartDate(startDate); wxFlowRecordService.saveOrUpdate(wxFlowRecord); //修改记录表当前状态 wxFlowRecordMapper.updateCurrStatus(new WxFlowRecord(processInstanceId,EnumRentContractAppStatus.SETBACK.getCode())); @@ -941,6 +955,11 @@ public class WxFlowServiceImpl implements WxFlowService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowRecordMapper.findList(record)); } + @Override + public PageInfo myHandelList(WxFlowRecord record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowRecordMapper.myHandelList(record)); + } + @Override public void genProcessDiagram(HttpServletResponse httpServletResponse,String businessId) throws Exception { List result = wxFlowRecordService.findList(new WxFlowRecord(Long.parseLong(businessId))); diff --git a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml index 19f741fc8..88ea8d92f 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml @@ -20,6 +20,7 @@ + @@ -29,7 +30,8 @@ `id`,`business_id`,`business_type`,`user_id`,`remark`,`status`,`task_id`,`process_instance_id`,`create_date`,`update_date`,`tenant_id`,`user_name`,task_key,task_name,curr_status,variables, REPLACE (JSON_EXTRACT(variables,'$.contractType'),'"','') contractType, REPLACE (JSON_EXTRACT(variables,'$.endProperty'),'"','') endProperty, - REPLACE (JSON_EXTRACT(variables,'$.contractNumber'),'"','') contractNumber + REPLACE (JSON_EXTRACT(variables,'$.contractNumber'),'"','') contractNumber, + start_date @@ -63,6 +65,11 @@ + update wx_flow_record set curr_status=#{currStatus} where process_instance_id=#{processInstanceId}