Просмотр исходного кода

[审批流][修改][物业合同发起审批合并]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
e6a5ece943
3 измененных файлов: 20 добавлений и 5 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +18
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java Просмотреть файл

@@ -65,10 +65,9 @@ public class WxRentContractController extends BaseController {
public ResultData updateFile(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile");
wxRentContract.setTenantId(getTenantId());
return wxRentContractService.updateFile(wxRentContract, getUser().getId());
return wxRentContractService.updateFile(wxRentContract, getUser().getId(),getUser().getName());
}


@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true)
public ResultData delete(String id) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -62,7 +62,7 @@ public interface WxRentContractService {

void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id);

ResultData updateFile(WxRentContract wxRentContract, Long userId);
ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName);

ResultData updateRentContractStatus(Long id);



+ 18
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -803,8 +803,24 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

@Override
public ResultData updateFile(WxRentContract record, Long userId) {
return getResultDataForUpdate(record, userId);
@Transactional(rollbackFor = {Exception.class})
public ResultData updateFile(WxRentContract record, Long userId,String userName) {
ResultData resultData = getResultDataForUpdate(record, userId);
try {
record.getFlowParams().put("businessId",record.getId().toString());
record.getFlowParams().put("supplement",true);
wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId());

// 合同状态改成待签约
WxRentContract updateRentContract = new WxRentContract();
updateRentContract.setId(record.getId());
updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
wxRentContractMapper.updateStatus(updateRentContract);
} catch (Exception e) {
logger.error("启动审批流失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage());
}
return resultData;
}

@Override


Загрузка…
Отмена
Сохранить