| @@ -244,6 +244,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| // } | // } | ||||
| //wxRentContract.setRentShopType(null); | //wxRentContract.setRentShopType(null); | ||||
| //wxRentContract.setOperationType(null); | //wxRentContract.setOperationType(null); | ||||
| return wxRentContractService.updateFile(wxRentContract, user,user.getName(),true); | return wxRentContractService.updateFile(wxRentContract, user,user.getName(),true); | ||||
| } | } | ||||
| @@ -42,7 +42,7 @@ public class WxFlowModel extends TenantEntity { | |||||
| private String flowId; | private String flowId; | ||||
| @TableField(exist = false) | @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; | private Integer flowType; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -207,7 +207,6 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") | @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") | ||||
| private List<WxAllBill> reviewBillPropertyPList; | private List<WxAllBill> reviewBillPropertyPList; | ||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") | @io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") | ||||
| private String remark; | private String remark; | ||||
| @@ -1813,6 +1813,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| rc.setStatus(wxRentContract.getStatus()); | rc.setStatus(wxRentContract.getStatus()); | ||||
| } | } | ||||
| rc.setFileNames(record.getFileNames()); | rc.setFileNames(record.getFileNames()); | ||||
| rc.setRemark(record.getRemark()); | |||||
| wxRentContractMapper.updateById(rc); | wxRentContractMapper.updateById(rc); | ||||
| if (null != wxRentContract.getOperationType() && EnumContractOperationType.WHOLE.getCode().equals(wxRentContract.getOperationType())) { | if (null != wxRentContract.getOperationType() && EnumContractOperationType.WHOLE.getCode().equals(wxRentContract.getOperationType())) { | ||||
| WxPropertyContract pc = wxPropertyContractMapper.findOneByRentId(wxRentContract); | WxPropertyContract pc = wxPropertyContractMapper.findOneByRentId(wxRentContract); | ||||
| @@ -83,6 +83,7 @@ | |||||
| <result column="first_bill_date_end" jdbcType="TIMESTAMP" property="firstBillDateEnd"/> | <result column="first_bill_date_end" jdbcType="TIMESTAMP" property="firstBillDateEnd"/> | ||||
| <result column="first_bill_receive_date" jdbcType="TIMESTAMP" property="firstBillReceiveDate"/> | <result column="first_bill_receive_date" jdbcType="TIMESTAMP" property="firstBillReceiveDate"/> | ||||
| <result column="shop_id_str" jdbcType="VARCHAR" property="shopIdStr"/> | <result column="shop_id_str" jdbcType="VARCHAR" property="shopIdStr"/> | ||||
| <result column="remark" jdbcType="VARCHAR" property="remark"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| @@ -98,7 +99,7 @@ | |||||
| `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, | `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, | `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, | 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 | |||||
| </sql> | </sql> | ||||