diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 235cf4d1a..54d0e39c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -244,6 +244,7 @@ public class WxRentContractController extends WxContractBaseController { // } //wxRentContract.setRentShopType(null); //wxRentContract.setOperationType(null); + return wxRentContractService.updateFile(wxRentContract, user,user.getName(),true); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 0c28a8f40..dda181c2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -42,7 +42,7 @@ public class WxFlowModel extends TenantEntity { private String flowId; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价券上架",name="flowType") + @io.swagger.annotations.ApiModelProperty(value="EnumFlowKey流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价券上架",name="flowType") private Integer flowType; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 94e7e2ee1..b785e25fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -207,7 +207,6 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") private List reviewBillPropertyPList; - @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") private String remark; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index d9e923ce5..cdd1f5c39 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1813,6 +1813,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { rc.setStatus(wxRentContract.getStatus()); } rc.setFileNames(record.getFileNames()); + rc.setRemark(record.getRemark()); wxRentContractMapper.updateById(rc); if (null != wxRentContract.getOperationType() && EnumContractOperationType.WHOLE.getCode().equals(wxRentContract.getOperationType())) { WxPropertyContract pc = wxPropertyContractMapper.findOneByRentId(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 809fbe776..e8415fea8 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -83,6 +83,7 @@ + @@ -98,7 +99,7 @@ `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,first_bill_receive_date, bussiness_management_fee,bussiness_management_fee_ratio_way,bussiness_management_fee_ratio,shop_id_str, - operating_management_fee,operating_management_fee_ratio_way,operating_management_fee_ratio,out_date_notify_days,out_date_notify_phone,design_file + operating_management_fee,operating_management_fee_ratio_way,operating_management_fee_ratio,out_date_notify_days,out_date_notify_phone,design_file,remark