winter пре 1 година
родитељ
комит
4584864626
2 измењених фајлова са 17 додато и 11 уклоњено
  1. +13
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +4
    -4
      mallinkAdmin/src/main/resources/db/migration/V202405010.sql

+ 13
- 7
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Прегледај датотеку

@@ -285,11 +285,12 @@ public class WxPropertyContractController extends WxContractBaseController {


//第三步提交 //第三步提交
@PostMapping("update") @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(); MallUserInfo user = getUser();
wxPropertyContract.updateTenantInfo(user); wxPropertyContract.updateTenantInfo(user);
wxPropertyContract.setAdjustPeriodHandle();
wxPropertyContract.setFileNames(fileNames);
wxPropertyContract.setFlowParams(flowParams);
return wxPropertyContractService.updateFile(wxPropertyContract, user, user.getName(),true); 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.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.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()) { }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 { }else {
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { 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()) { }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); return wxPropertyContractService.apply(contract,user);


+ 4
- 4
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_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_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);

Loading…
Откажи
Сачувај