Browse Source

Merge remote-tracking branch 'origin/v1.0' into v1.0

v1.0
15989082884@163.com 2 years ago
parent
commit
a344eaa3e3
  1. 7
      src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java
  2. 2
      src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java
  3. 38
      src/main/java/com/qs/serve/common/util/AuthContextUtils.java
  4. 2
      src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
  5. 4
      src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
  6. 9
      src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java
  7. 18
      src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java
  8. 15
      src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java
  9. 8
      src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
  10. 2
      src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java
  11. 4
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java
  12. 6
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java
  13. 2
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
  14. 6
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java
  15. 3
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
  16. 139
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
  17. 3
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
  18. 3
      src/main/resources/mapper/his/HisUserSupplierMapper.xml

7
src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@ -16,6 +16,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply;
import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
import com.qs.serve.modules.tbs.service.impl.TbsBudgetApplyOperationServiceImpl;
import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl;
import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl;
import com.qs.serve.modules.tzc.service.impl.TzcPolicyOperationServiceImpl;
import com.qs.serve.modules.vtb.common.VtbVerificationState;
@ -92,9 +93,9 @@ public class AsyncFactory {
public void run() {
try {
AuthContextUtils.setTenant("001");
log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------");
log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
Thread.sleep(7*1000);
TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class);
TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class);
String summeryResult = applyOperationService.checkAffairSummery(budgetId);
if(summeryResult.equals(SeeYonOperationService.SummeryState_Success)){
@ -173,7 +174,7 @@ public class AsyncFactory {
public void run() {
try {
AuthContextUtils.setTenant("001");
log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------");
log.debug("--------------------------submitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
Thread.sleep(7*1000);
TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class);
String summeryResult = applyOperationService.checkAffairSummery(budgetId);

2
src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@ -71,7 +71,7 @@ public class HttpServletRequestFilter implements Filter{
}
StringBuffer buffer = new StringBuffer("["+method+"] "+url);
if(supplierId!=null){
buffer.append("供应商ID: "+supplierId);
buffer.append(" 供应商ID: "+supplierId);
}
if(!StringUtils.isEmpty(queryStr)){
buffer.append("\n参数: "+queryStr);

38
src/main/java/com/qs/serve/common/util/AuthContextUtils.java

@ -84,25 +84,25 @@ public class AuthContextUtils {
Long supplierId = AuthContextUtils.getSupplierId();
BmsSupplierService supplierService = SpringUtils.getBean(BmsSupplierService.class);
BmsSupplier supplier = supplierService.getById(supplierId);
if(supplier==null){
Assert.throwEx(4106,"供应商无效或未授权");
}
boolean isOther = false;
if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){
for (String otherUserId : supplier.getOtherUserIds()) {
if(userId.equals(otherUserId)){
isOther = true;
break;
}
}
}
if(isOther && !supplier.getUserId().equals(userId)){
Assert.throwEx(4106,"供应商无效或未授权");
}
if(supplier.getStopFlag().equals(1)){
Assert.throwEx(4106,"供应商已停用");
}
// if(supplier==null){
// Assert.throwEx(4106,"供应商无效或未授权");
// }
// boolean isOther = false;
//
// if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){
// for (String otherUserId : supplier.getOtherUserIds()) {
// if(userId.equals(otherUserId)){
// isOther = true;
// break;
// }
// }
// }
// if(isOther && !supplier.getUserId().equals(userId)){
// Assert.throwEx(4106,"供应商无效或未授权");
// }
// if(supplier.getStopFlag().equals(1)){
// Assert.throwEx(4106,"供应商已停用");
// }
return supplier;
}

2
src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java

@ -77,6 +77,8 @@ public class BmsSupplierVisitAddressController {
userSupplier.setQueryValue(param.getSearchValue());
userSupplier.setLocalX(param.getLocalX());
userSupplier.setLocalY(param.getLocalY());
userSupplier.setStopFlag(param.getStopFlag());
userSupplier.setCooperatePauseFlag(param.getCooperatePauseFlag());
List<String> userIds = sysPostUserService.listByChildIds(userId);
userIds.add(userId);
userSupplier.setSelectUserIds(userIds);

4
src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@ -387,6 +387,10 @@ public class BmsSupplier implements Serializable {
userSupplier.setSupplierFlag(this.getSupplierFlag());
userSupplier.setType(type);
userSupplier.setCostFlag(this.costFlag);
userSupplier.setStopFlag(this.stopFlag);
userSupplier.setStopFlagDate(this.stopFlagDate);
userSupplier.setCooperatePauseFlag(this.cooperatePauseFlag);
userSupplier.setCooperatePauseFlagDate(this.getCooperatePauseFlagDate());
return userSupplier;
}

9
src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java

@ -43,4 +43,13 @@ public class BmsSupplierVisitSo {
/** 翻页参数2 */
private Integer pageSize;
/** 闭户 */
private Integer stopFlag;
/** 暂不合作 */
private Integer cooperatePauseFlag;
}

18
src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java

@ -108,6 +108,24 @@ public class HisUserSupplier implements Serializable {
/** 是否供应商 */
private Integer supplierFlag;
/** 闭户 */
private Integer stopFlag;
/** 闭户日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime stopFlagDate;
/** 暂不合作 */
private Integer cooperatePauseFlag;
/** 暂不合作日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime cooperatePauseFlagDate;
@TableField(exist = false)
private String queryAddress;

15
src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java

@ -108,6 +108,21 @@ public class HisUserSupplierTemp implements Serializable {
/** */
private Integer costFlag;
/** 闭户 */
private Integer stopFlag;
/** 闭户日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime stopFlagDate;
/** 暂不合作 */
private Integer cooperatePauseFlag;
/** 暂不合作日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime cooperatePauseFlagDate;
public static HisUserSupplierTemp toNewObject(HisUserSupplierTemp source){
HisUserSupplierTemp userSupplierTemp = new HisUserSupplierTemp();

8
src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java

@ -98,6 +98,7 @@ public class OmsShoppingCartApi {
}
shoppingCart.setPicUrl(goodsSku.getPicUrl());
shoppingCart.setSpuId(goodsSku.getSpuId());
shoppingCart.setAddPrice(goodsSku.getSalesPrice());
GoodsSpu goodsSpu = goodsSpuService.getById(shoppingCart.getSpuId());
if(!goodsSpu.getShelf().equals(1)){
return R.error("商品已下架");
@ -111,7 +112,12 @@ public class OmsShoppingCartApi {
List<GoodsSkuSpecValueVo> skuSpecValues = goodsSkuSpecValueService.listSpecValueBySkuId(goodsSku.getId());
String specInfo = skuSpecValues.stream().map(GoodsSkuSpecValueVo::getSpecValue).collect(Collectors.joining(";"));
shoppingCart.setSpecInfo(specInfo);
if(param.getCartId()==null){
omsShoppingCartService.save(shoppingCart);
}else {
shoppingCart.setId(param.getCartId());
omsShoppingCartService.updateById(shoppingCart);
}
return R.ok();
}
@ -123,7 +129,7 @@ public class OmsShoppingCartApi {
@DeleteMapping("/deleteById/{id}")
public R<?> deleteById(@PathVariable("id") Long id){
omsShoppingCartService.removeById(id);
return R.error();
return R.ok();
}
}

2
src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java

@ -14,6 +14,8 @@ import java.math.BigDecimal;
@Data
public class OmsShoppingCartSaveBo {
private Long cartId;
/** 商品SKU */
@NotNull(message = "商品SKU不能为空")
private Long skuId;

4
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java

@ -121,6 +121,8 @@ public class TbsCostContractController {
contract.setAttachIds(param.getAttachIds());
contract.setSignTime(param.getSignTime());
contract.setExpireTime(param.getExpireTime());
contract.setBusinessCompany(param.getBusinessCompany());
contract.setDutyNumber(param.getDutyNumber());
boolean result = tbsCostContractService.updateById(contract);
return R.isTrue(result);
}
@ -153,6 +155,8 @@ public class TbsCostContractController {
contract.setSealId(param.getSealId());
contract.setSealNum(param.getSealNum());
contract.setFileNum(param.getFileNum());
contract.setBusinessCompany(param.getBusinessCompany());
contract.setDutyNumber(param.getDutyNumber());
}
if(contract.getId()==null){
tbsCostContractService.save(contract);

6
src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java

@ -67,6 +67,12 @@ public class TbsCostContract implements Serializable {
@Length(max = 255,message = "备注长度不能超过255字")
private String remark;
/** 业务所属公司 */
private String businessCompany;
/** 税号 */
private String dutyNumber;
/** 创建时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

2
src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java

@ -59,6 +59,8 @@ public class TbsAffairCommitBo {
*/
private List<AffairSubjectLine> affairSubjectLines;
@Data
public static class AffairSubjectLine{

6
src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java

@ -40,6 +40,12 @@ public class TbsCostContractBo implements Serializable {
/** 合同条件(文本框) */
private String contractCondition;
/** 业务所属公司 */
private String businessCompany;
/** 税号 */
private String dutyNumber;
/** 合同附件地址 */
private String[] attachIds;

3
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java

@ -82,8 +82,7 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
//启用预算
tbsBudget.setBudgetState(1);
budgetMapper.updateById(tbsBudget);
SysUser sysUser = getSysUserService().getById(AuthContextUtils.getSysUserId());
SysUser sysUser = getSysUserService().getById(tbsBudget.getUserId());
LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>();
lqw.eq(TbsScheduleItemBudget::getBudgetId,param.getTargetId());
List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw);

139
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java

@ -189,30 +189,41 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
//加载 品类
Map<String,GoodsCategory> categoryMap = loadGoodsCategoryMap(param);
//有错误信息退出
if(param.isErrorFlag()){
return null;
}
this.save(budgetBatch);
//保存后赋值
Long batchId = budgetBatch.getId();
//修改的生成为更变记录
List<TbsBudgetBatchBo.BudgetMain> updBudgetList = paramBudgetList.stream()
.filter(a->StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList());
List<TbsBudget> budgetList = new ArrayList<>();
if(updBudgetList.size()>0){
List<String> budgetNumbers = updBudgetList.stream()
.map(TbsBudgetBatchBo.BudgetMain::getBudgetNumber).collect(Collectors.toList());
List<TbsBudget> budgetList = tbsBudgetService.list(
budgetList = tbsBudgetService.list(
new LambdaQueryWrapper<TbsBudget>().in(
TbsBudget::getBudgetNumber,budgetNumbers
)
);
for (TbsBudget budget : budgetList) {
if(budget.getBudgetCheckState()==TbsBudgetCheckState.State_1_apply){
Assert.throwEx("预算["+budget.getBudgetCode()+"]审批中,无法导入修改");
for (TbsBudgetBatchBo.BudgetMain budgetMain : updBudgetList) {
if(budgetMain.getBudgetNumber().equals(budget.getBudgetNumber())){
budgetMain.getErrorInfos().add("预算["+budget.getBudgetCode()+"]审批中,无法导入修改");
param.setErrorFlag(true);
}
}
}
}
}
//有错误信息退出
if(param.isErrorFlag()){
return null;
}
this.save(budgetBatch);
//保存后赋值
Long batchId = budgetBatch.getId();
if(updBudgetList.size()>0){
for (TbsBudget budget : budgetList) {
TbsBudgetBatchBo.BudgetMain paramItem = null;
for (TbsBudgetBatchBo.BudgetMain budgetMain : updBudgetList) {
@ -303,7 +314,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
}
private void toUpdateBudgetInfo(Long batchId,SysUser sysUser, Map<String, TbsSchedule> scheduleMap, Map<String, BmsSubject> subjectMap, Map<String, TbsCenterDto> centerDtoMap, Map<String, GoodsCategory> categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) {
tbsBudgetService.removeById(budgetId);
//tbsBudgetService.removeById(budgetId);
tbsBudgetConditionService.remove(
new LambdaQueryWrapper<TbsBudgetCondition>()
.eq(TbsBudgetCondition::getBudgetId, budgetId)
@ -378,12 +389,12 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
}
for (TbsBudgetBatchBo.BudgetAmount budgetAmount : scheduleAmountList) {
if(budgetAmount.getScheduleItemName().equals(itemBudget.getItemName())){
boolean ne1 = ! itemBudget.getPreDispatchAmount().equals(budgetAmount.getPreDispatchAmount());
boolean ne2 = ! realAmt.equals(budgetAmount.getBudgetAmount());
boolean ne1 = ! (itemBudget.getPreDispatchAmount().compareTo(budgetAmount.getPreDispatchAmount())==0);
boolean ne2 = ! (realAmt.compareTo(budgetAmount.getBudgetAmount())==0);
if(ne1 || ne2){
TbsBudgetChangeScheduleItem resultItem = TbsBudgetChangeScheduleItem.toNewObject(itemBudget);
resultItem.setChangeId(changeId);
resultItem.setNewBudgetAmount(realAmt);
resultItem.setNewBudgetAmount(budgetAmount.getBudgetAmount());
resultItem.setNewPreDispatchAmount(budgetAmount.getPreDispatchAmount());
changeScheduleItemList.add(resultItem);
}
@ -427,7 +438,37 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
GoodsCategory category = categoryMap.get(value);
TbsBudgetCondition budgetCondition = new TbsBudgetCondition();
budgetCondition.setBudgetId(budgetId);
budgetCondition.setTargetType(GoodsType.Brand.name());
budgetCondition.setTargetType(TbsGoodsType.brand.name());
budgetCondition.setTargetId(category.getId());
budgetCondition.setTargetCode(category.getCode());
budgetCondition.setTargetName(category.getName());
budgetCondition.setTargetLevelPathIds(category.getLevelPath());
budgetCondition.setTargetLevelPathNames(category.getLevelPathNames());
conditionList.add(budgetCondition);
}
}
if(StringUtils.hasText(paramItem.getCategoryNames())){
String[] values = paramItem.getCategoryNames().split(",");
for (String value : values) {
GoodsCategory category = categoryMap.get(value);
TbsBudgetCondition budgetCondition = new TbsBudgetCondition();
budgetCondition.setBudgetId(budgetId);
budgetCondition.setTargetType(TbsGoodsType.category.name());
budgetCondition.setTargetId(category.getId());
budgetCondition.setTargetCode(category.getCode());
budgetCondition.setTargetName(category.getName());
budgetCondition.setTargetLevelPathIds(category.getLevelPath());
budgetCondition.setTargetLevelPathNames(category.getLevelPathNames());
conditionList.add(budgetCondition);
}
}
if(StringUtils.hasText(paramItem.getSeriesNames())){
String[] values = paramItem.getSeriesNames().split(",");
for (String value : values) {
GoodsCategory category = categoryMap.get(value);
TbsBudgetCondition budgetCondition = new TbsBudgetCondition();
budgetCondition.setBudgetId(budgetId);
budgetCondition.setTargetType(TbsGoodsType.series.name());
budgetCondition.setTargetId(category.getId());
budgetCondition.setTargetCode(category.getCode());
budgetCondition.setTargetName(category.getName());
@ -525,18 +566,78 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
);
if(goodsCategories.size()!= goodsCategoryNames.size()){
for (String categoryName : goodsCategoryNames) {
boolean exist = goodsCategories.stream().anyMatch(a->a.getName().equals(categoryName));
if(!exist){
//Assert.throwEx("无效的品类:"+categoryName);
List<GoodsCategory> tempList = goodsCategories.stream()
.filter(a->a.getName().equals(categoryName)).collect(Collectors.toList());
if(tempList.size()<1){
for (TbsBudgetBatchBo.BudgetMain budgetMain : paramBudgetList) {
boolean bandNamesFlag = budgetMain.getBrandNames() != null && budgetMain.getBrandNames().contains(categoryName);
boolean categoryNamesFlag = budgetMain.getCategoryNames() != null && budgetMain.getCategoryNames().contains(categoryName);
boolean seriesNamesFlag = budgetMain.getSeriesNames() != null && budgetMain.getSeriesNames().contains(categoryName);
if(bandNamesFlag){
budgetMain.getErrorInfos().add("无效的品牌:"+categoryName);
param.setErrorFlag(true);
break;
}
if(categoryNamesFlag){
budgetMain.getErrorInfos().add("无效的品类:"+categoryName);
param.setErrorFlag(true);
break;
}
if(seriesNamesFlag){
budgetMain.getErrorInfos().add("无效的系列:"+categoryName);
param.setErrorFlag(true);
break;
}
}
}
}
}else{
for (String categoryName : goodsCategoryNames) {
List<GoodsCategory> tempList = goodsCategories.stream()
.filter(a->a.getName().equals(categoryName)).collect(Collectors.toList());
for (TbsBudgetBatchBo.BudgetMain budgetMain : paramBudgetList) {
boolean bandNamesFlag = budgetMain.getBrandNames() != null && budgetMain.getBrandNames().contains(categoryName);
boolean categoryNamesFlag = budgetMain.getCategoryNames() != null && budgetMain.getCategoryNames().contains(categoryName);
boolean seriesNamesFlag = budgetMain.getSeriesNames() != null && budgetMain.getSeriesNames().contains(categoryName);
if(bandNamesFlag||categoryNamesFlag||seriesNamesFlag){
if(bandNamesFlag){
boolean isTrue = false;
for (GoodsCategory category : tempList) {
if(category.getLevel().equals(1)){
isTrue = true;
break;
}
}
if(!isTrue){
budgetMain.getErrorInfos().add("无效的品牌:"+categoryName);
param.setErrorFlag(true);
}
}
if(categoryNamesFlag){
boolean isTrue = false;
for (GoodsCategory category : tempList) {
if(category.getLevel().equals(2)){
isTrue = true;
break;
}
}
if(!isTrue){
budgetMain.getErrorInfos().add("无效的品类:"+categoryName);
param.setErrorFlag(true);
}
}
if(seriesNamesFlag){
boolean isTrue = false;
for (GoodsCategory category : tempList) {
if(category.getLevel().equals(3)){
isTrue = true;
break;
}
}
if(!isTrue){
budgetMain.getErrorInfos().add("无效的系列:"+categoryName);
param.setErrorFlag(true);
}
}
}
}
}

3
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -601,6 +601,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
data.put("costCenterNo",concatCenterCodes);
data.put("costCenterName",concatCenterNames);
data.put("businessCompany",contract.getBusinessCompany());
data.put("businessCompanyId",contract.getDutyNumber());
data.put("contractName",contract.getContractName());
data.put("applyMoney",contract.getContractAmount());
data.put("signDate",contract.getSignTime()==null?null:contract.getSignTime().toString());

3
src/main/resources/mapper/his/HisUserSupplierMapper.xml

@ -45,7 +45,8 @@
<if test="query.bizRegionThird != null and query.bizRegionThird != ''"> and `his_user_supplier`.`biz_region_third` = #{query.bizRegionThird}</if>
<if test="query.bizRegionFourthly != null and query.bizRegionFourthly != ''"> and `his_user_supplier`.`biz_region_fourthly` = #{query.bizRegionFourthly}</if>
<if test="query.tenantId != null and query.tenantId != ''"> and `his_user_supplier`.`tenant_id` = #{query.tenantId}</if>
<if test="query.costFlag != null"> and `his_user_supplier`.`cost_flag` = #{query.costFlag}</if>
<if test="query.stopFlag != null"> and `his_user_supplier`.`stop_flag` = #{query.stopFlag}</if>
<if test="query.cooperatePauseFlag != null"> and `his_user_supplier`.`cooperate_puse_flag` = #{query.cooperatePauseFlag}</if>
<if test="query.queryAddress != null and query.queryAddress != ''"> and `bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryAddress},'%') </if>
<if test="query.queryValue != null and query.queryValue != ''">
and (`bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryValue},'%')

Loading…
Cancel
Save