|
|
|
@ -47,6 +47,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
|
|
|
|
|
private MaterialMapper materialMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// @Override
|
|
|
|
|
// public IPage<MaterialVoMobileEntity> page(IPage<MaterialVoMobileEntity> page, Wrapper<MaterialEntity> queryWrapper) {
|
|
|
|
|
//
|
|
|
|
@ -131,6 +132,93 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
|
|
|
|
|
return materialPagination.setData(list, list.size());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<MaterialEntity> getList2(MaterialPagination materialPagination) {
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList =new ArrayList();
|
|
|
|
|
int total=0;
|
|
|
|
|
int materialNum =0;
|
|
|
|
|
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
materialQueryWrapper.eq("a.delete_mark", "0");
|
|
|
|
|
boolean pcPermission = true;
|
|
|
|
|
boolean appPermission = true;
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
if (ObjectUtil.isEmpty(materialObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
materialQueryWrapper = (QueryWrapper<MaterialEntity>)materialObj;
|
|
|
|
|
materialNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
if (ObjectUtil.isEmpty(materialObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
materialQueryWrapper = (QueryWrapper<MaterialEntity>)materialObj;
|
|
|
|
|
materialNum++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
if(StringUtil.isNotEmpty(materialPagination.getItemCode())){
|
|
|
|
|
materialNum++;
|
|
|
|
|
materialQueryWrapper.lambda().like(MaterialEntity::getItemCode,materialPagination.getItemCode());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(StringUtil.isNotEmpty(materialPagination.getItemName())){
|
|
|
|
|
materialNum++;
|
|
|
|
|
materialQueryWrapper.lambda().like(MaterialEntity::getItemName,materialPagination.getItemName());
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if(AllIdList.size()>0){
|
|
|
|
|
materialQueryWrapper.lambda().in(MaterialEntity::getId, AllIdList);
|
|
|
|
|
}
|
|
|
|
|
//排序
|
|
|
|
|
/* if(StringUtil.isEmpty(materialPagination.getSidx())){
|
|
|
|
|
materialQueryWrapper.lambda().orderByDesc(MaterialEntity::getCreatorTime);
|
|
|
|
|
}else{
|
|
|
|
|
try {
|
|
|
|
|
String sidx = materialPagination.getSidx();
|
|
|
|
|
MaterialVoMobileEntity materialEntity = new MaterialVoMobileEntity();
|
|
|
|
|
Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
|
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
|
materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
if(StringUtil.isEmpty(materialPagination.getSidx())){
|
|
|
|
|
materialPagination.setSidx("CREATOR_TIME");
|
|
|
|
|
materialPagination.setSort("DESC");
|
|
|
|
|
}else{
|
|
|
|
|
try {
|
|
|
|
|
String sidx = materialPagination.getSidx();
|
|
|
|
|
MaterialVoMobileEntity materialEntity = new MaterialVoMobileEntity();
|
|
|
|
|
Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
|
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
|
materialPagination.setSidx(value);
|
|
|
|
|
// materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
|
|
|
|
|
IPage<MaterialEntity> userIPage= materialMapper.queryMaterial(page,materialPagination, materialQueryWrapper);
|
|
|
|
|
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<MaterialEntity> getTypeList(MaterialPagination materialPagination,String dataType){
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|