|
|
|
@@ -285,11 +285,12 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
|
|
|
|
//第三步提交 |
|
|
|
@PostMapping("update") |
|
|
|
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); |
|
|
|
public ResultData update(@RequestBody Long id,String fileNames,Map<String, Object> flowParams) { |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxPropertyContract.updateTenantInfo(user); |
|
|
|
wxPropertyContract.setAdjustPeriodHandle(); |
|
|
|
wxPropertyContract.setFileNames(fileNames); |
|
|
|
wxPropertyContract.setFlowParams(flowParams); |
|
|
|
return wxPropertyContractService.updateFile(wxPropertyContract, user, user.getName(),true); |
|
|
|
|
|
|
|
} |
|
|
|
@@ -481,17 +482,22 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
String remark = ""; |
|
|
|
Map<String, Object> map = contract.getFlowParams(); |
|
|
|
if (null != map) { |
|
|
|
remark = (String) map.get("remark"); |
|
|
|
} |
|
|
|
if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { |
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, contract.getRemark(), contract.getId(),null)); |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, remark, contract.getId(),null)); |
|
|
|
}else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.PROPERTY_POINT, contract.getRemark(), contract.getId(),null)); |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.PROPERTY_POINT, remark, contract.getId(),null)); |
|
|
|
} |
|
|
|
}else { |
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, contract.getRemark(), contract.getId(),null)); |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, remark, contract.getId(),null)); |
|
|
|
}else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, contract.getRemark(), contract.getId(),null)); |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, remark, contract.getId(),null)); |
|
|
|
} |
|
|
|
} |
|
|
|
return wxPropertyContractService.apply(contract,user); |
|
|
|
|