| @@ -108,6 +108,7 @@ public class WxMerchantController extends BaseController { | |||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); | wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| wxMerchant.setType(type); | wxMerchant.setType(type); | ||||
| wxMerchant.setCarVendorType(0); | |||||
| return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); | return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); | ||||
| } | } | ||||
| @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.base.BaseEntity.SortField; | |||||
| import com.iformall.enums.EnumContractOperationType; | import com.iformall.enums.EnumContractOperationType; | ||||
| import com.iformall.enums.EnumContractType; | import com.iformall.enums.EnumContractType; | ||||
| import com.iformall.enums.EnumFlowContractType; | import com.iformall.enums.EnumFlowContractType; | ||||
| @@ -84,6 +85,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| wxRentContract = new WxRentContract(); | wxRentContract = new WxRentContract(); | ||||
| } | } | ||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | wxRentContract.updateTenantInfo(getTenantInfo()); | ||||
| wxRentContract.setSortColumns(SortField.Createtime_DESC); | |||||
| //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | ||||
| return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -60,12 +60,14 @@ insert into wx_property_contract_20200826 select * from wx_property_contract; | |||||
| ALTER TABLE wx_property_contract DROP COLUMN shop_id; | ALTER TABLE wx_property_contract DROP COLUMN shop_id; | ||||
| ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称'; | ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称'; | ||||
| //刷shop_name字段 | |||||
| //待刷语句 | |||||
| //刷shop_name字段,合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。租金合同rentinfo | |||||
| ALTER TABLE `wx_rent_contract` | ALTER TABLE `wx_rent_contract` | ||||
| ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; | ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; | ||||
| 合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。 | |||||
| ALTER TABLE `wx_c_user_car` | ALTER TABLE `wx_c_user_car` | ||||
| ADD COLUMN `vendor_person_id` VARCHAR(100) DEFAULT NULL COMMENT '停车场的会员ID'; | ADD COLUMN `vendor_person_id` VARCHAR(100) DEFAULT NULL COMMENT '停车场的会员ID'; | ||||
| @@ -729,6 +729,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| record.setRentalStartDate(oldRentStartDate); | record.setRentalStartDate(oldRentStartDate); | ||||
| record.setShopName(shopName); | record.setShopName(shopName); | ||||
| record.setStatus(wxRentContract.getStatus()); | record.setStatus(wxRentContract.getStatus()); | ||||
| record.setApplyStatus(wxRentContract.getApplyStatus()); | |||||
| wxRentContractMapper.updateById(record); | wxRentContractMapper.updateById(record); | ||||
| record.setRentalStartDate(tempDate); | record.setRentalStartDate(tempDate); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||