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