sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改采购退货数据

master
赵雪冰 2 years ago
parent
3ed56c604e
commit
770fb4cb7c
2 changed files with 77 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 122
      win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java
  2. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java

122
win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java
View File

@ -9,6 +9,7 @@ import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* QueryWrapper工具类 * QueryWrapper工具类
@ -31,56 +32,81 @@ public class QueryWrapperUtils {
if(column == null || column.isEmpty() || condition.getValue() == null || condition.getValue().isEmpty() || condition.getAction() == null || condition.getAction().isEmpty()) { if(column == null || column.isEmpty() || condition.getValue() == null || condition.getValue().isEmpty() || condition.getAction() == null || condition.getAction().isEmpty()) {
continue; continue;
} }
column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, column); dealCondition(queryWrapper, condition, column);
switch (condition.getAction()) { }
case "==" : return queryWrapper;
queryWrapper.eq(column, condition.getValue()); }
break;
case "!=" : public static <T> QueryWrapper<T> structureFilter(CustomConditions customConditions, List<String> excludeConditions) {
queryWrapper.ne(column, condition.getValue()); QueryWrapper<T> queryWrapper = new QueryWrapper<>();
break; if(CollectionUtils.isAnyEmpty(customConditions.getFilters())) {
case ">" : return queryWrapper;
queryWrapper.gt(column, condition.getValue()); }
break; for(CustomConditions.Condition condition : customConditions.getFilters()) {
case "<" : String column = condition.getColumn();
queryWrapper.lt(column, condition.getValue()); if(column == null || column.isEmpty() || condition.getValue() == null || condition.getValue().isEmpty() || condition.getAction() == null || condition.getAction().isEmpty()) {
break; continue;
case ">=" : }
queryWrapper.ge(column, condition.getValue()); if(excludeConditions != null && excludeConditions.size() > 0){
break; if(excludeConditions.contains(column)){
case "<=" : continue;
queryWrapper.le(column, condition.getValue()); }
break;
case "like" :
queryWrapper.like(column, condition.getValue());
break;
case "in" :
String[] strs = condition.getValue().split(",");
queryWrapper.in(column, Arrays.asList(strs));
break;
case "notin" :
strs = condition.getValue().split(",");
queryWrapper.notIn(column, Arrays.asList(strs));
break;
case "betweeen" :
strs = condition.getValue().split(",");
if(strs.length != 2) {
break;
}
LocalDateTime localDateTime1 = Instant.ofEpochMilli(Long.parseLong(strs[0])).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
LocalDateTime localDateTime2 = Instant.ofEpochMilli(Long.parseLong(strs[1])).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
queryWrapper.between(column, localDateTime1, localDateTime2);
break;
case "isNull" :
queryWrapper.isNull(column);
break;
case "isNotNull" :
queryWrapper.isNotNull(column);
break;
default:
break;
} }
dealCondition(queryWrapper, condition, column);
} }
return queryWrapper; return queryWrapper;
} }
private static <T> void dealCondition(QueryWrapper<T> queryWrapper, CustomConditions.Condition condition, String column) {
column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, column);
switch (condition.getAction()) {
case "==" :
queryWrapper.eq(column, condition.getValue());
break;
case "!=" :
queryWrapper.ne(column, condition.getValue());
break;
case ">" :
queryWrapper.gt(column, condition.getValue());
break;
case "<" :
queryWrapper.lt(column, condition.getValue());
break;
case ">=" :
queryWrapper.ge(column, condition.getValue());
break;
case "<=" :
queryWrapper.le(column, condition.getValue());
break;
case "like" :
queryWrapper.like(column, condition.getValue());
break;
case "in" :
String[] strs = condition.getValue().split(",");
queryWrapper.in(column, Arrays.asList(strs));
break;
case "notin" :
strs = condition.getValue().split(",");
queryWrapper.notIn(column, Arrays.asList(strs));
break;
case "betweeen" :
strs = condition.getValue().split(",");
if(strs.length != 2) {
break;
}
LocalDateTime localDateTime1 = Instant.ofEpochMilli(Long.parseLong(strs[0])).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
LocalDateTime localDateTime2 = Instant.ofEpochMilli(Long.parseLong(strs[1])).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
queryWrapper.between(column, localDateTime1, localDateTime2);
break;
case "isNull" :
queryWrapper.isNull(column);
break;
case "isNotNull" :
queryWrapper.isNotNull(column);
break;
default:
break;
}
}
} }

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java
View File

@ -121,10 +121,12 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe
@Override @Override
public PageResult<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailSeniorBySupplierCode(CustomConditions conditions) { public PageResult<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailSeniorBySupplierCode(CustomConditions conditions) {
String supplierCode = ""; String supplierCode = "";
List<String> filterList = new ArrayList<>();
for(CustomConditions.Condition condition : conditions.getFilters()) { for(CustomConditions.Condition condition : conditions.getFilters()) {
String column = condition.getColumn(); String column = condition.getColumn();
if("supplierCode".equals(column)){ if("supplierCode".equals(column)){
supplierCode = condition.getValue(); supplierCode = condition.getValue();
filterList.add("supplierCode");
} }
} }
List<String> supplierItemCodeList = new ArrayList<>(); List<String> supplierItemCodeList = new ArrayList<>();
@ -138,7 +140,7 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe
supplierItemCodeList.addAll(itemCodeList); supplierItemCodeList.addAll(itemCodeList);
} }
} }
QueryWrapper<PurchasereceiptRecordDetailDO> queryWrapper = QueryWrapperUtils.structure(conditions); QueryWrapper<PurchasereceiptRecordDetailDO> queryWrapper = QueryWrapperUtils.structureFilter(conditions,filterList);
if(!CollectionUtils.isEmpty(supplierItemCodeList)){ if(!CollectionUtils.isEmpty(supplierItemCodeList)){
queryWrapper.in("item_code",supplierItemCodeList); queryWrapper.in("item_code",supplierItemCodeList);
} }

Write Preview
Loading…
Cancel
Save