Browse Source

补录发起审批流,并走同一个事务

release_toaliyun_real
luozukai 7 years ago
parent
commit
31a512f358
4 changed files with 14 additions and 4 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java View File

@@ -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")


+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -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<String, Object> flowParams;

public Map<String, Object> getFlowParams() {
return flowParams;
}

public void setFlowParams(Map<String, Object> flowParams) {
this.flowParams = flowParams;
}

public Integer getApplyStatus() {
return applyStatus;
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -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);



+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java View File

@@ -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;




Loading…
Cancel
Save