diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
index fa7e42d9..fc86bf0c 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
@@ -253,6 +253,9 @@ public class TbsCostApplyController {
TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply());
//entity.setId(IdUtil.getSnowFlakeId());
BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId());
+ if(StringUtils.hasText(supplier.getRegion2Last())){
+
+ }
boolean contract = entity.getContractFlag()!=null&&entity.getContractFlag().equals(1);
if(contract&&!supplier.getSupplierFlag().equals(1)){
return R.error("当前用户非供应商");
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
index ecf51a42..1f792f49 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
@@ -55,6 +55,15 @@ public class TbsCostApply implements Serializable {
@TableField(condition = SqlCondition.LIKE)
private String supplierName;
+ @TableField(condition = SqlCondition.LIKE)
+ private String supplierBizRegionFirstName;
+
+ @TableField(condition = SqlCondition.LIKE)
+ private String supplierBizRegionSecondName;
+
+ @TableField(condition = SqlCondition.LIKE)
+ private String supplierBizRegionThirdName;
+
/** 状态:0=未发布;1=审批中;2=待执行;3=完成;4-被驳回;5-中止;6-作废;7-异动 @{link TbsCostApplyState} */
@NotNull(message = "状态不能为空")
private Integer chargeState;
diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml
index e103c286..90ee5873 100644
--- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml
+++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml
@@ -33,6 +33,11 @@
+
+
+
+
+
@@ -42,6 +47,9 @@
tbs_cost_apply.`supplier_id`,
tbs_cost_apply.`supplier_code`,
tbs_cost_apply.`supplier_name`,
+ tbs_cost_apply.`supplier_biz_region_first_name`,
+ tbs_cost_apply.`supplier_biz_region_second_name`,
+ tbs_cost_apply.`supplier_biz_region_third_name`,
tbs_cost_apply.`charge_state`,
tbs_cost_apply.`submit_time`,
tbs_cost_apply.`pass_time`,
@@ -140,6 +148,9 @@
and `tbs_cost_apply`.`supplier_id` = #{query.supplierId}
and `tbs_cost_apply`.`supplier_code` like concat('%', #{query.supplierCode},'%')
and `tbs_cost_apply`.`supplier_name` like concat('%', #{query.supplierName},'%')
+ and `tbs_cost_apply`.`supplier_biz_region_first_name` like concat('%', #{query.supplierBizRegionFirstName},'%')
+ and `tbs_cost_apply`.`supplier_biz_region_second_name` like concat('%', #{query.supplierBizRegionSecondName},'%')
+ and `tbs_cost_apply`.`supplier_biz_region_third_name` like concat('%', #{query.supplierBizRegionThirdName},'%')
and `tbs_cost_apply`.`charge_state` = #{query.chargeState}
and `tbs_cost_apply`.`submit_time` = #{query.submitTime}
and `tbs_cost_apply`.`pass_time` = #{query.passTime}