Просмотр исходного кода

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
7a78385de0
4 измененных файлов: 23 добавлений и 1 удалений
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  2. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 14
- 0
mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Просмотреть файл

@@ -236,6 +236,20 @@ public class WxFlowAbleController extends BaseController {
wxFlowModel.updateTenantInfo(getTenantInfo());
return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel));
}
@ApiOperation("业务查询是否存在模板")
@GetMapping(value = "/businessHasFlow")
@SystemControllerLog(description = "工作流-模板列表")
public Integer businessHasFlow(@ModelAttribute WxFlowModel wxFlowModel) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness");
wxFlowModel.updateTenantInfo(getTenantInfo());
List<WxFlowModel> models = wxFlowService.getModelBybusiness(wxFlowModel);
if (null != models && models.size() > 0 ) {
return 1;
}else {
return 0;
}
}

/**
* 配置列表


+ 3
- 0
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql Просмотреть файл

@@ -57,3 +57,6 @@ ALTER TABLE wx_rent_contract DROP COLUMN shop_id;

ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称';

ALTER TABLE `wx_rent_contract`
ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签';


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -31,6 +31,9 @@ public class WxRentContract extends TenantEntity {

protected Long id;

@io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId")
private Long fromId;
@TableField(exist = false)
@SortColumn(column = "shopNumber")
private String shopNumber;


+ 3
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -68,6 +68,7 @@
<result column="subject_name" property="subjectName"/>
<result column="rent_start_type" property="rentStartType"/>
<result column="shop_name" property="shopName"/>
<result column="from_id" property="fromId"/>

<result column="rent_input_way" property="rentInputWay"/>
<result column="adjust_ratio_way" property="adjustRatioWay"/>
@@ -84,7 +85,7 @@
`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,
`brand`,`business_id`,`shop_type`,`updatetime`,`createtime`,`link_person`,`link_phone`,
`pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`,
`start_date`,`end_date`,`shop_name`,
`start_date`,`end_date`,`shop_name`,`from_id`,
`apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`,
`business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type,
`rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio,bus_discount_time
@@ -94,6 +95,7 @@
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">and `id` = #{id}</if>
<if test=" null != fromId ">and `from_id` = #{fromId}</if>
<if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if>
<if test=" null != price and '' != price">and `price` = #{price}</if>
<if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if>


Загрузка…
Отмена
Сохранить