| @@ -44,7 +44,7 @@ public class WxRentContractController extends BaseController { | |||||
| public ResultData add(@RequestBody WxRentContract wxRentContract) { | public ResultData add(@RequestBody WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); | ||||
| wxRentContract.setTenantId(getTenantId()); | wxRentContract.setTenantId(getTenantId()); | ||||
| return wxRentContractService.save(wxRentContract, getUser().getId()); | |||||
| return wxRentContractService.save(wxRentContract, getUser().getId(),getUser().getName()); | |||||
| } | } | ||||
| @PostMapping("update") | @PostMapping("update") | ||||
| @@ -7,6 +7,7 @@ import java.io.Serializable; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| @@ -193,6 +194,17 @@ public class WxRentContract implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建合同方式1新建2补录", name = "way") | @io.swagger.annotations.ApiModelProperty(value = "创建合同方式1新建2补录", name = "way") | ||||
| private Integer 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() { | public Integer getApplyStatus() { | ||||
| return applyStatus; | return applyStatus; | ||||
| } | } | ||||
| @@ -37,7 +37,7 @@ public interface WxRentContractService { | |||||
| * @param record | * @param record | ||||
| * @param id | * @param id | ||||
| */ | */ | ||||
| ResultData save(WxRentContract record, Long userId); | |||||
| ResultData save(WxRentContract record, Long userId,String userName); | |||||
| ResultData update(WxRentContract record, Long userId); | ResultData update(WxRentContract record, Long userId); | ||||
| @@ -19,11 +19,9 @@ import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.data.redis.core.StringRedisTemplate; | import org.springframework.data.redis.core.StringRedisTemplate; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.concurrent.atomic.AtomicInteger; | |||||
| import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||