diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index bfa5c2bf5..7cb7c5171 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -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 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 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); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202405010.sql b/mallinkAdmin/src/main/resources/db/migration/V202405010.sql index 617e1162a..e3c33396c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202405010.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202405010.sql @@ -3443,8 +3443,8 @@ ALTER TABLE wx_bill_other_deposit_97 ADD COLUMN update_by_name VARCHAR(100 ALTER TABLE wx_bill_other_deposit_98 ADD COLUMN update_by_name VARCHAR(100) COMMENT '创建用户id' ; ALTER TABLE wx_bill_other_deposit_99 ADD COLUMN update_by_name VARCHAR(100) COMMENT '创建用户id' ; -alter table wx_rent_contract add column create_by int(20); -alter table wx_rent_contract add column update_by int(20); +alter table wx_rent_contract add column create_by BIGINT(20); +alter table wx_rent_contract add column update_by BIGINT(20); -alter table wx_property_contract add column create_by int(20); -alter table wx_property_contract add column update_by int(20); +alter table wx_property_contract add column create_by BIGINT(20); +alter table wx_property_contract add column update_by BIGINT(20);