diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 434759081..e16314f1e 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -60,6 +60,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 + diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index c8ebadd3f..ee6ca2c06 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -95,6 +95,8 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } + + @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml index a6c7c0588..6b39c307a 100644 --- a/mallinkBApi/pom.xml +++ b/mallinkBApi/pom.xml @@ -30,6 +30,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 + diff --git a/mallinkCApi/pom.xml b/mallinkCApi/pom.xml index 647618dbc..921193087 100644 --- a/mallinkCApi/pom.xml +++ b/mallinkCApi/pom.xml @@ -30,6 +30,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 + diff --git a/mallinkMQConsumer/pom.xml b/mallinkMQConsumer/pom.xml index ba97fccf5..e9f9580d5 100644 --- a/mallinkMQConsumer/pom.xml +++ b/mallinkMQConsumer/pom.xml @@ -27,6 +27,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 + diff --git a/mallinkSchedule/pom.xml b/mallinkSchedule/pom.xml index 6464e21a8..61cef6d1d 100644 --- a/mallinkSchedule/pom.xml +++ b/mallinkSchedule/pom.xml @@ -27,6 +27,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 + diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index ed4ea9844..caf1bb46e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -4,11 +4,10 @@ package com.iformall.enums; * Created by luozukai * 流程key */ -public enum EnumFlowKey { - - CONTRACT("contract_flow", "合同审批流程"), - BILL("end_bill_flow", "账单审批流程"), - END_CONTRACT("end_contract_flow", "终止合同审批流程"), +public enum EnumFlowKey{ + CONTRACT(1, "contract_flow"), //合同审批 + BILL(2, "end_bill_flow"),//账单审批 + END_CONTRACT(3, "end_contract_flow")//终止合同审批 ; public static EnumFlowKey getEnum(Integer code) { @@ -20,15 +19,15 @@ public enum EnumFlowKey { return null; } - private String code; + private Integer code; private String message; - EnumFlowKey(String code, String message) { + EnumFlowKey(Integer code, String message) { this.code = code; this.message = message; } - public String getCode() { + public Integer getCode() { return code; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java index 6a3e0b6b4..55b05bd15 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java @@ -11,6 +11,4 @@ public interface WxFlowRecordMapper extends CommonMapper { void updateCurrStatus(WxFlowRecord record); List myHandelList(WxFlowRecord flowRecord); - - Integer myHandelListTotal(WxFlowRecord flowRecord); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 875bfa1c0..b731aada9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -52,4 +52,6 @@ public interface WxRentContractMapper extends CommonMapper void updateInvalidContract(WxRentContract record); List selectRentContractByMerchantId(WxRentContract wxRentContract); + + List selectRentContractByShopId(WxRentContract record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index f23adc733..019848b75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -741,11 +741,32 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getOweBillAsPage(record)); + List> list = pageInfo.getList(); + for (Map map:list) { + map.put("rentOwe",subZeroAndDot(map.get("rentOwe").toString())); + map.put("propertyOwe",subZeroAndDot(map.get("propertyOwe").toString())); + map.put("depositOwe",subZeroAndDot(map.get("depositOwe").toString())); + map.put("otherOwe",subZeroAndDot(map.get("otherOwe").toString())); + map.put("totalOwe",subZeroAndDot(map.get("totalOwe").toString())); + } + pageInfo.setList(list); Map result = new HashMap<>(); result.put("pageInfo", pageInfo); return result; } + /** + * 使用java正则表达式去掉多余的.与0 + * @param s + * @return + */ + public static String subZeroAndDot(String s){ + if(s.indexOf(".") > 0){ + s = s.replaceAll("0+?$", "");//去掉多余的0 + s = s.replaceAll("[.]$", "");//如最后一位是.则去掉 + } + return s; + } @Override public void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { @@ -754,15 +775,16 @@ public class WxBillAllServiceImpl implements WxBillAllService { for (Map map:data) { OweMerchantVo oweMerchantVo = new OweMerchantVo(); oweMerchantVo.setBuilding((Long)map.get("building")); - oweMerchantVo.setDepositOwe((BigDecimal) map.get("depositOwe")); oweMerchantVo.setFloor((Long)map.get("floor")); oweMerchantVo.setLinkPerson((String)map.get("manager")); oweMerchantVo.setName((String)map.get("merchantName")); oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); - oweMerchantVo.setOtherOwe((BigDecimal) map.get("otherOwe")); - oweMerchantVo.setPropertyOwe((BigDecimal) map.get("propertyOwe")); - oweMerchantVo.setRentOwe((BigDecimal) map.get("rentOwe")); - oweMerchantVo.setTotalOwe((BigDecimal) map.get("totalOwe")); + + oweMerchantVo.setDepositOwe(new BigDecimal(subZeroAndDot(map.get("depositOwe").toString()))); + oweMerchantVo.setOtherOwe(new BigDecimal(subZeroAndDot(map.get("otherOwe").toString()))); + oweMerchantVo.setPropertyOwe(new BigDecimal(subZeroAndDot(map.get("propertyOwe").toString()))); + oweMerchantVo.setRentOwe(new BigDecimal(subZeroAndDot(map.get("rentOwe").toString()))); + oweMerchantVo.setTotalOwe(new BigDecimal(subZeroAndDot(map.get("totalOwe").toString()))); list.add(oweMerchantVo); } String name = "欠缴商户列表"; 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 33eb9cd62..f6a23823a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -20,6 +20,7 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.bpmn.model.BpmnModel; +import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; @@ -96,14 +97,7 @@ public class WxFlowServiceImpl implements WxFlowService { * @return */ public static String getFlowKeyByType(int flowType){ - if(1 == flowType){ - return EnumFlowKey.CONTRACT.getCode(); - }else if(2 == flowType){ - return EnumFlowKey.BILL.getCode(); - }else if(3 == flowType){ - return EnumFlowKey.END_CONTRACT.getCode(); - } - return null; + return EnumFlowKey.getEnum(flowType).getMessage(); } /** @@ -588,7 +582,12 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(); } String processInstanceId = resultList.get(0).getProcessInstanceId(); - ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + ProcessInstance pi = null; + try { + pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + }catch (FlowableIllegalArgumentException e){ + logger.error("getTaskStatusList query inst error",e); + } if(pi == null){ return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 68a5514c9..4aede0d2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -145,7 +145,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(id); wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); - wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List resultList = wxBillPropertyMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); 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 45b29a9cd..0b86f0dce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.shiro.SecurityUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; @@ -185,7 +186,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setRentContractId(id); wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC); - wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List resultList = wxBillRentMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); @@ -622,6 +622,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setTenantId(wxRentContract.getTenantId()); record.setStatus(EnumRentContractStatus.INVALID.getCode()); wxRentContractMapper.updateInvalidContract(record); + List rentContractList = wxRentContractMapper.selectRentContractByShopId(record); + for (WxRentContract updateContract : rentContractList) { + updateInvalidStatus(updateContract); + } } } else { WxRentContract record = new WxRentContract(); @@ -629,8 +633,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setRentShopType(wxRentContract.getRentShopType()); record.setStatus(EnumRentContractStatus.INVALID.getCode()); wxRentContractMapper.updateRentInvalidStatus(record); + List rentContractList = wxRentContractMapper.select(record); + for (WxRentContract updateContract : rentContractList) { + updateInvalidStatus(updateContract); + } } - updateInvalidStatus(wxRentContract); + } @Override @@ -660,26 +668,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.SUCCESS, "操作成功"); } - public void updateInvalidStatus(WxRentContract wxRentContract) { - WxRentContract record = new WxRentContract(); - record.setTenantId(wxRentContract.getTenantId()); - record.setStatus(EnumRentContractStatus.INVALID.getCode()); + public void updateInvalidStatus(WxRentContract record) { + Long id = record.getId(); //审核流程中止 - List collect = wxRentContractMapper.select(record).stream() - .map(r -> r.getId()).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(collect)) { - for (Long id : collect) { - try { - logger.info("合同id:{},开始停止...", id); - //结束审批流 by luozukai - List tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) - .processVariableValueEquals("businessId", id).list(); - if (!CollectionUtils.isEmpty(tasks)) { - for (Task task : tasks) { - logger.info("合同id:{},taskid:{}", id, task.getId()); - runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); - } - } + try { + logger.info("合同id:{},开始停止...", id); + //结束审批流 by luozukai + List tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) + .processVariableValueEquals("businessId", id).list(); + if (!CollectionUtils.isEmpty(tasks)) { + for (Task task : tasks) { + logger.info("合同id:{},taskid:{}", id, task.getId()); + runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); + // 修改合同审核状态 WxRentContract rentContract = record; rentContract.setId(id); @@ -687,15 +688,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { updateApplyStatus(rentContract); // 保存审批历史入 + MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); WxFlowRecord updateRecord = new WxFlowRecord(); updateRecord.setBusinessId(id); updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode()); updateRecord.setBusinessType(1); + updateRecord.setUserId(mallUserInfo.getId()); + updateRecord.setProcessInstanceId(task.getProcessInstanceId()); wxFlowRecordService.saveOrUpdate(updateRecord); - } catch (Exception e) { - logger.error("deleteProcessInstance error", e); } } + + } catch (Exception e) { + logger.error("deleteProcessInstance error", e); } } @@ -1240,40 +1245,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { int allCount = wxRentContractMapper.selectCount(wxRentContract); resultData.put("allCount", allCount); - //审核流程中止 - List collect = wxRentContractMapper.getRentInvalidList(wxRentContract).stream() - .map(r -> r.getId()).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(collect)) { - for (Long id:collect) { - try { - logger.info("合同id:{},开始停止...",id); - //结束审批流 by luozukai - List tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) - .processVariableValueEquals("businessId",id).list(); - if (!CollectionUtils.isEmpty(tasks)) { - for (Task task:tasks) { - logger.info("合同id:{},taskid:{}",id,task.getId()); - runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); - } - } - // 修改合同审核状态 - WxRentContract rentContract = new WxRentContract(); - rentContract.setId(id); - rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); - updateApplyStatus(rentContract); - - // 保存审批历史入 - WxFlowRecord updateRecord = new WxFlowRecord(); - updateRecord.setBusinessId(id); - updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode()); - updateRecord.setBusinessType(1); - wxFlowRecordService.saveOrUpdate(updateRecord); - }catch (Exception e){ - logger.error("deleteProcessInstance error",e); - } - } - } - //待签约 wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml index 88ea8d92f..2745c7c7c 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml @@ -67,7 +67,7 @@ @@ -75,6 +75,5 @@ update wx_flow_record set curr_status=#{currStatus} where process_instance_id=#{processInstanceId} and status = 1 - - + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 7453c3f99..e43336c0d 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -235,6 +235,11 @@ select count(*) from wx_rent_contract where tenant_id=#{tenantId} and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and status in (2,3,4) + + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and id in(select r.id from ( select id from wx_rent_contract where json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) diff --git a/mallinkWebSocketServer/pom.xml b/mallinkWebSocketServer/pom.xml index bf3cd9aaa..fbf66c981 100644 --- a/mallinkWebSocketServer/pom.xml +++ b/mallinkWebSocketServer/pom.xml @@ -35,6 +35,105 @@ spring-boot-maven-plugin true + ZIP + + antlr, + cn.afterturn, + ch.qos.logback, + com.alibaba, + com.amazonaws, + com.mchange, + com.fasterxml.jackson.core, + com.fasterxml.jackson.dataformat, + com.fasterxml.jackson.datatype, + com.fasterxml.jackson.module, + com.github.axet, + com.github.binarywang, + com.github.jsqlparser, + com.github.pagehelper, + com.github.ulisesbocchio, + com.github.virtuald, + com.google.code.gson, + com.google.guava, + com.google.protobuf, + com.google.zxing, + com.jayway.jsonpath, + com.jhlabs, + com.puppycrawl.tools, + com.rabbitmq, + com.squareup.okhttp3, + com.squareup.okio, + com.sun, + com.sun.mail, + com.thoughtworks.xstream, + com.zaxxer, + commons-beanutils, + commons-cli, + commons-codec, + commons-collections, + commons-io, + commons-logging, + io.lettuce, + io.netty, + io.projectreactor, + io.springfox, + io.swagger, + io.undertow, + javax.activation, + javax.mail, + javax.persistence, + javax.xml.bind, + joda-time, + junit, + mysql, + net.bytebuddy, + net.minidev, + net.sf.saxon, + ognl, + org.antlr, + org.apache.commons, + org.apache.httpcomponents, + org.apache.logging.log4j, + org.apache.poi, + org.apache.poi.wso2, + org.apache.rocketmq, + org.apache.shiro, + org.apache.tomcat.embed, + org.apache.xmlbeans, + org.aspectj, + org.assertj, + org.bouncycastle, + org.checkerframework, + org.crazycake, + org.dom4j, + org.flowable, + org.hibernate.validator, + org.jasypt, + org.javassist, + org.jboss.spec.javax.annotation, + org.jboss.xnio, + org.jdom, + org.mockito, + org.mybatis, + org.mybatis.generator, + org.mybatis.spring.boot, + org.ow2.asm, + org.projectlombok, + org.quartz-scheduler, + org.rocketmq.spring.boot, + org.springframework, + org.springframework.amqp, + org.springframework.boot, + org.springframework.data, + org.springframework.retry, + org.springframework.ws, + org.yaml, + redis.clients, + software.amazon.ion, + tk.mybatis, + xmlpull, + xpp3 +