Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
ff0231782f
3 ha cambiato i file con 27 aggiunte e 106 eliminazioni
  1. +0
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java
  2. +22
    -82
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +5
    -16
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 0
- 8
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java Vedi File

@@ -155,8 +155,6 @@ public class WxAgileContractController extends WxContractBaseController {
if (null == wxRentContract.getSignDate()) { if (null == wxRentContract.getSignDate()) {
return new ResultData(Result.ERROR,"请选择合同签约日期"); return new ResultData(Result.ERROR,"请选择合同签约日期");
} }
wxRentContract.setStartDate(wxRentContract.getRentalStartDate());
wxRentContract.setEndDate(wxRentContract.getRentalEndDate());
String rentInfo = wxRentContract.getRentInfo(); String rentInfo = wxRentContract.getRentInfo();
if (StringUtils.isBlank(rentInfo)) { if (StringUtils.isBlank(rentInfo)) {
return new ResultData(Result.ERROR,"请选择铺位"); return new ResultData(Result.ERROR,"请选择铺位");
@@ -455,10 +453,6 @@ public class WxAgileContractController extends WxContractBaseController {
return new ResultData(Result.ERROR, "请选择租赁开始日期和截止日期"); return new ResultData(Result.ERROR, "请选择租赁开始日期和截止日期");
} }
if (null == wxRentContract.getStartDate()){
return new ResultData(Result.ERROR, "请选择计租日期");
}
if (null == wxRentContract.getSignDate()){ if (null == wxRentContract.getSignDate()){
return new ResultData(Result.ERROR, "请选择签约日期"); return new ResultData(Result.ERROR, "请选择签约日期");
} }
@@ -477,8 +471,6 @@ public class WxAgileContractController extends WxContractBaseController {
rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); rentContract.setRentalStartDate(wxRentContract.getRentalStartDate());
rentContract.setRentalEndDate(wxRentContract.getRentalEndDate()); rentContract.setRentalEndDate(wxRentContract.getRentalEndDate());
rentContract.setSignDate(wxRentContract.getSignDate()); rentContract.setSignDate(wxRentContract.getSignDate());
rentContract.setStartDate(wxRentContract.getStartDate());
rentContract.setEndDate(wxRentContract.getStartDate());
try { try {
rentContractValidShop(rentContract); rentContractValidShop(rentContract);


+ 22
- 82
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Vedi File

@@ -60,37 +60,18 @@ public class WxRentContract extends TenantEntity {
private Date rentalStartDate; private Date rentalStartDate;
@io.swagger.annotations.ApiModelProperty(value = "祖赁截止时间", name = "rentalEndDate") @io.swagger.annotations.ApiModelProperty(value = "祖赁截止时间", name = "rentalEndDate")
private Date rentalEndDate; private Date rentalEndDate;
@io.swagger.annotations.ApiModelProperty(value = "计租开始日期", name = "startDate")
private Date startDate;
@io.swagger.annotations.ApiModelProperty(value = "计租截止日期", name = "endDate")
private Date endDate;
@io.swagger.annotations.ApiModelProperty(value = "施工图纸", name = "designFile") @io.swagger.annotations.ApiModelProperty(value = "施工图纸", name = "designFile")
private String designFile; private String designFile;
@io.swagger.annotations.ApiModelProperty(value = "装修期开始时间", name = "fixStartDate")
private Date fixStartDate;
@io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate")
private Date fixEndDate;
@io.swagger.annotations.ApiModelProperty(value = "租期总月数(月)", name = "lease") @io.swagger.annotations.ApiModelProperty(value = "租期总月数(月)", name = "lease")
private Integer lease; private Integer lease;
@io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId") @io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId")
private Long fromId; private Long fromId;
//地址
//联系地址
private String linkAddress; private String linkAddress;

@io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson")
private String linkPerson; private String linkPerson;

@io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone")
private String linkPhone; private String linkPhone;

@io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount")
private String payAccount;

@io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName")
private String bankName;

@io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize")
private Integer decimalSize = Constant.default_short_decimal_size ; private Integer decimalSize = Constant.default_short_decimal_size ;
@TableField(exist = false) @TableField(exist = false)
@@ -98,6 +79,8 @@ public class WxRentContract extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath")
private String filepath; private String filepath;
@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames")
private String fileNames;
@io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status") @io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status")
private Integer status; private Integer status;
@TableField(exist = false) @TableField(exist = false)
@@ -113,7 +96,6 @@ public class WxRentContract extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit") @io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit")
private String cashtypeContentLsit; private String cashtypeContentLsit;

@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel; private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime")
@@ -130,57 +112,22 @@ public class WxRentContract extends TenantEntity {
private String createByName; private String createByName;
@io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea")
private String rentArea; private String rentArea;
@io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr") @io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr")
private String shopIdStr; private String shopIdStr;

@io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type") @io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type")
private Integer type; private Integer type;
@TableField(exist = false)
private String typeName;
@TableField(exist = false)
private List<Integer> typeList;

@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回", name = "applyStatus")
@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus")
private Integer applyStatus; private Integer applyStatus;

@io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") @io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime")
private Date endContractTime; private Date endContractTime;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")
private Map<String, Object> flowParams;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList")
private List<WxAllBill> previewBillRentList;

@io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") @io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark")
private String remark; private String remark;
@io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo")
private String rentInfo; private String rentInfo;

@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames")
private String fileNames;

@io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute") @io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute")
private Integer dayPriceCalcute; private Integer dayPriceCalcute;
@io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays") @io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays")
private Integer monthAverageDays; private Integer monthAverageDays;

@io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas")
@TableField(exist = false)
private Integer flowHas;
//联营扣点跳点设置
@TableField(exist = false)
private List<WxRentContractRevenueJump> revenueJumps;
@io.swagger.annotations.ApiModelProperty(value = "联营跳点设置说明", name = "revenueJumpsRemark")
private String revenueJumpsRemark;

@io.swagger.annotations.ApiModelProperty(value = "免租期说明", name = "freePeriodRemark")
private String freePeriodRemark;
public List<Long> shopIdsByRentInfo() { public List<Long> shopIdsByRentInfo() {
List<Long> shopList = Lists.newArrayList(); List<Long> shopList = Lists.newArrayList();
@@ -254,31 +201,6 @@ public class WxRentContract extends TenantEntity {
return null; return null;
} }
// public Map<Long,WxEnergyFees> getDepositEnergyFees(Map<Long,WxEnergyFees> feesMap) {
// String dsdstr = this.getCashtypeContentLsit();
// if (!StringUtils.isBlank(dsdstr)) {
// Map<Long,WxEnergyFees> retMap = new HashMap<Long,WxEnergyFees>();
// JSONArray rentInfoArray = JSONArray.parseArray(dsdstr);
// int size = rentInfoArray.size();
// for (int i = 0; i < size; i++) {
// JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
// String depositType = rentInfoObject.getString("value");
// String deposit = rentInfoObject.getString("deposit");
// Long dt = Long.parseLong(depositType);
// WxEnergyFees fees = feesMap.get(dt);
// WxEnergyFees nfees = new WxEnergyFees();
// nfees.setId(fees.getId());
// nfees.setName(fees.getName());
// nfees.setCalcuteUnit(fees.getCalcuteUnit());
// nfees.setPrice(deposit);
// retMap.put(dt, nfees);
// }
// return retMap;
// }
// return null;
// }
@TableField(exist = false) @TableField(exist = false)
private List<RentContractFreePeriodVo> freePeriods; private List<RentContractFreePeriodVo> freePeriods;
public void setFreeVo(List<WxRentContractFreePeriod> freePeriods) { public void setFreeVo(List<WxRentContractFreePeriod> freePeriods) {
@@ -302,6 +224,24 @@ public class WxRentContract extends TenantEntity {
this.setFreePeriods(voList); this.setFreePeriods(voList);
} }
} }
@io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas")
@TableField(exist = false)
private Integer flowHas;
//联营扣点跳点设置
@TableField(exist = false)
private List<WxRentContractRevenueJump> revenueJumps;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")
private Map<String, Object> flowParams;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList")
private List<WxAllBill> previewBillRentList;
@TableField(exist = false)
private String typeName;
@TableField(exist = false)
private List<Integer> typeList;
@TableField(exist = false) @TableField(exist = false)
private String building; private String building;
@TableField(exist = false) @TableField(exist = false)


+ 5
- 16
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Vedi File

@@ -23,16 +23,10 @@
<result column="is_del" jdbcType="INTEGER" property="isDel"/> <result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/>
<result column="link_phone" jdbcType="VARCHAR" property="linkPhone"/> <result column="link_phone" jdbcType="VARCHAR" property="linkPhone"/>
<result column="pay_account" jdbcType="VARCHAR" property="payAccount"/>
<result column="link_address" jdbcType="VARCHAR" property="linkAddress"/> <result column="link_address" jdbcType="VARCHAR" property="linkAddress"/>
<result column="lease" jdbcType="INTEGER" property="lease"/> <result column="lease" jdbcType="INTEGER" property="lease"/>
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="start_date" jdbcType="TIMESTAMP" property="startDate"/>
<result column="end_date" jdbcType="TIMESTAMP" property="endDate"/>
<result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/>
<result column="bank_name" jdbcType="VARCHAR" property="bankName"/>
<result column="fix_start_date" property="fixStartDate"/>
<result column="fix_end_date" property="fixEndDate"/>
<result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/> <result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/>
<result column="file_names" jdbcType="VARCHAR" property="fileNames"/> <result column="file_names" jdbcType="VARCHAR" property="fileNames"/>
<result column="from_id" property="fromId"/> <result column="from_id" property="fromId"/>
@@ -40,8 +34,6 @@
<result column="design_file" jdbcType="VARCHAR" property="designFile"/> <result column="design_file" jdbcType="VARCHAR" property="designFile"/>
<result column="day_price_calcute" jdbcType="INTEGER" property="dayPriceCalcute"/> <result column="day_price_calcute" jdbcType="INTEGER" property="dayPriceCalcute"/>
<result column="month_average_days" jdbcType="INTEGER" property="monthAverageDays"/> <result column="month_average_days" jdbcType="INTEGER" property="monthAverageDays"/>
<result column="revenue_jumps_remark" jdbcType="VARCHAR" property="revenueJumpsRemark"/>
<result column="free_period_remark" jdbcType="VARCHAR" property="freePeriodRemark"/>
<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"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap> </resultMap>
@@ -50,12 +42,12 @@
`id`,`customers_id`,`tenant_id`,`parent_tenant_id`, `id`,`customers_id`,`tenant_id`,`parent_tenant_id`,
`decimal_size`,`rental_start_date`,`rental_end_date`,`sign_date`, `decimal_size`,`rental_start_date`,`rental_end_date`,`sign_date`,
`filepath`,`status`,`contract_number`,`create_by`,`update_by`, `filepath`,`status`,`contract_number`,`create_by`,`update_by`,
`day_price_calcute`,`month_average_days`,`free_period_remark`,
cashtype_content_lsit,`is_del`,`revenue_jumps_remark`,
`day_price_calcute`,`month_average_days`,
cashtype_content_lsit,`is_del`,
`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, `updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`,
`pay_account`,`lease`,`type`,
`start_date`,`end_date`,`from_id`,`end_contract_time`,
`apply_status`,`bank_name`,`fix_start_date`,`fix_end_date`,`create_by_name`,`update_by_name`,
`lease`,`type`,
`from_id`,`end_contract_time`,
`apply_status`,`create_by_name`,`update_by_name`,
`rent_info`, `file_names`, `rent_info`, `file_names`,
shop_id_str, shop_id_str,
design_file,remark design_file,remark
@@ -92,11 +84,8 @@
<if test=" null != createtime and '' != createtime">and `createtime` = #{createtime}</if> <if test=" null != createtime and '' != createtime">and `createtime` = #{createtime}</if>
<if test=" null != linkPerson and '' != linkPerson">and `link_person` = #{linkPerson}</if> <if test=" null != linkPerson and '' != linkPerson">and `link_person` = #{linkPerson}</if>
<if test=" null != linkPhone and '' != linkPhone">and `link_phone` = #{linkPhone}</if> <if test=" null != linkPhone and '' != linkPhone">and `link_phone` = #{linkPhone}</if>
<if test=" null != payAccount and '' != payAccount">and `pay_account` = #{payAccount}</if>
<if test=" null != lease and '' != lease">and `lease` = #{lease}</if> <if test=" null != lease and '' != lease">and `lease` = #{lease}</if>
<if test=" null != type and '' != type">and `type` = #{type}</if> <if test=" null != type and '' != type">and `type` = #{type}</if>
<if test=" null != startDate and '' != startDate">and `start_date` = #{startDate}</if>
<if test=" null != endDate and '' != endDate">and `end_date` = #{endDate}</if>
<if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if> <if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if>
<if test=" null != dayPriceCalcute ">and `day_price_calcute` = #{dayPriceCalcute}</if> <if test=" null != dayPriceCalcute ">and `day_price_calcute` = #{dayPriceCalcute}</if>
<if test=" null != monthAverageDays ">and `month_average_days` = #{monthAverageDays}</if> <if test=" null != monthAverageDays ">and `month_average_days` = #{monthAverageDays}</if>


Caricamento…
Annulla
Salva