From 31a512f358620f89234de2989132b0047687dd42 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 26 Jan 2019 11:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E5=8F=91=E8=B5=B7=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81=EF=BC=8C=E5=B9=B6=E8=B5=B0=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 2 +- .../java/com/iformall/domain/po/WxRentContract.java | 12 ++++++++++++ .../com/iformall/service/WxRentContractService.java | 2 +- .../iformall/service/impl/DataTowerServiceImpl.java | 2 -- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 512fed169..e4b2f3e0f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -44,7 +44,7 @@ public class WxRentContractController extends BaseController { public ResultData add(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); wxRentContract.setTenantId(getTenantId()); - return wxRentContractService.save(wxRentContract, getUser().getId()); + return wxRentContractService.save(wxRentContract, getUser().getId(),getUser().getName()); } @PostMapping("update") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index cd0e79b03..427009b78 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -193,6 +194,17 @@ public class WxRentContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "创建合同方式1新建2补录", name = "way") private Integer way; + @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") + private Map flowParams; + + public Map getFlowParams() { + return flowParams; + } + + public void setFlowParams(Map flowParams) { + this.flowParams = flowParams; + } + public Integer getApplyStatus() { return applyStatus; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 1382b237e..1ff06f420 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -37,7 +37,7 @@ public interface WxRentContractService { * @param record * @param id */ - ResultData save(WxRentContract record, Long userId); + ResultData save(WxRentContract record, Long userId,String userName); ResultData update(WxRentContract record, Long userId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 9bd5ee7b7..ade5c1824 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -19,11 +19,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors;