|
|
@ -13,6 +13,7 @@ import java.math.BigDecimal;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil2;
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
@ -49,8 +50,12 @@ import javax.annotation.Resource;
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|
public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMapper, ProductWarehouseEntity> implements ProductWarehouseService{
|
|
|
|
public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMapper, ProductWarehouseEntity> implements ProductWarehouseService{
|
|
|
|
|
|
|
|
// @Autowired
|
|
|
|
|
|
|
|
// private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
private GeneraterSwapUtil2 generaterSwapUtil;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private UserProvider userProvider;
|
|
|
|
private UserProvider userProvider;
|
|
|
@ -740,7 +745,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
String value = productWarehousePagination.getCode() instanceof List ?
|
|
|
|
String value = productWarehousePagination.getCode() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getCode()) :
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getCode()) :
|
|
|
|
String.valueOf(productWarehousePagination.getCode());
|
|
|
|
String.valueOf(productWarehousePagination.getCode());
|
|
|
|
// productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getCode,value);
|
|
|
|
|
|
|
|
productWarehouseQueryWrapper.like("a.CODE",value);
|
|
|
|
productWarehouseQueryWrapper.like("a.CODE",value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -752,7 +756,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
String value = productWarehousePagination.getName() instanceof List ?
|
|
|
|
String value = productWarehousePagination.getName() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getName()) :
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getName()) :
|
|
|
|
String.valueOf(productWarehousePagination.getName());
|
|
|
|
String.valueOf(productWarehousePagination.getName());
|
|
|
|
// productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getName,value);
|
|
|
|
|
|
|
|
productWarehouseQueryWrapper.like("a.NAME",value);
|
|
|
|
productWarehouseQueryWrapper.like("a.NAME",value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -763,7 +766,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
String value = productWarehousePagination.getName() instanceof List ?
|
|
|
|
String value = productWarehousePagination.getName() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getId()) :
|
|
|
|
JsonUtil.getObjectToString(productWarehousePagination.getId()) :
|
|
|
|
String.valueOf(productWarehousePagination.getId());
|
|
|
|
String.valueOf(productWarehousePagination.getId());
|
|
|
|
// productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getId,value);
|
|
|
|
|
|
|
|
productWarehouseQueryWrapper.like("a.id",value);
|
|
|
|
productWarehouseQueryWrapper.like("a.id",value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -841,14 +843,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
}
|
|
|
|
}
|
|
|
|
productWarehouseQueryWrapper.lambda().in(ProductWarehouseEntity::getId, intersection);
|
|
|
|
productWarehouseQueryWrapper.lambda().in(ProductWarehouseEntity::getId, intersection);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//是否有高级查询
|
|
|
|
|
|
|
|
// if (StringUtil.isNotEmpty(superOp)){
|
|
|
|
|
|
|
|
// if (allSuperIDlist.size()==0){
|
|
|
|
|
|
|
|
// allSuperIDlist.add("jnpfNullList");
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
|
|
|
|
// productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllSuperIDlist));
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//是否有数据过滤查询
|
|
|
|
//是否有数据过滤查询
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)){
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)){
|
|
|
|
if (allRuleIDlist.size()==0){
|
|
|
|
if (allRuleIDlist.size()==0){
|
|
|
@ -858,11 +853,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllRuleIDlist));
|
|
|
|
productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllRuleIDlist));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//假删除标志
|
|
|
|
//假删除标志
|
|
|
|
// productWarehouseQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
|
|
|
|
|
|
|
|
productWarehouseQueryWrapper.isNull("a.f_delete_mark");
|
|
|
|
productWarehouseQueryWrapper.isNull("a.f_delete_mark");
|
|
|
|
//排序
|
|
|
|
//排序
|
|
|
|
if(StringUtil.isEmpty(productWarehousePagination.getSidx())){
|
|
|
|
if(StringUtil.isEmpty(productWarehousePagination.getSidx())){
|
|
|
|
// productWarehouseQueryWrapper.lambda().orderByDesc(ProductWarehouseEntity::getId);
|
|
|
|
|
|
|
|
productWarehousePagination.setSidx("a.f_creator_time");
|
|
|
|
productWarehousePagination.setSidx("a.f_creator_time");
|
|
|
|
productWarehousePagination.setSort("DESC");
|
|
|
|
productWarehousePagination.setSort("DESC");
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
@ -873,9 +866,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
|
|
|
|
Field declaredField = productWarehouseEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
Field declaredField = productWarehouseEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
// productWarehouseQueryWrapper="asc".equals(productWarehousePagination.getSort().toLowerCase())?productWarehouseQueryWrapper.orderByAsc(value):productWarehouseQueryWrapper.orderByDesc(value);
|
|
|
|
|
|
|
|
productWarehousePagination.setSidx("a." + value);
|
|
|
|
productWarehousePagination.setSidx("a." + value);
|
|
|
|
|
|
|
|
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|