|
|
|
@ -1,58 +1,45 @@
|
|
|
|
package jnpf.service.impl;
|
|
|
|
package jnpf.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
|
|
|
import jnpf.mapper.YysPackageReportMapper;
|
|
|
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
|
|
|
import jnpf.model.yyspackagereport.*;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
|
|
|
import jnpf.entity.YysPackageReportEntity;
|
|
|
|
|
|
|
|
import jnpf.mapper.YysPackageReportMapper;
|
|
|
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
|
|
|
import jnpf.model.yyspackagereport.YysPackageReportConstant;
|
|
|
|
|
|
|
|
import jnpf.model.yyspackagereport.YysPackageReportForm;
|
|
|
|
|
|
|
|
import jnpf.model.yyspackagereport.YysPackageReportPagination;
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
|
|
|
import jnpf.service.YysDayLogsService;
|
|
|
|
|
|
|
|
import jnpf.service.YysPackageReportService;
|
|
|
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
|
|
|
|
*
|
|
|
|
* yysPackageReport
|
|
|
|
* yysPackageReport
|
|
|
|
* 版本： V3.5
|
|
|
|
* 版本： V3.5
|
|
|
|
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
|
|
|
|
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
|
|
|
|
* 作者： JNPF开发平台组
|
|
|
|
* 作者： JNPF开发平台组
|
|
|
|
* 日期： 2024-08-07
|
|
|
|
* 日期： 2024-08-19
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|
@Slf4j
|
|
|
|
@Slf4j
|
|
|
|
@ -67,98 +54,98 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
private YysDayLogsService yysDayLogsService;
|
|
|
|
private YysDayLogsService yysDayLogsService;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination) {
|
|
|
|
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination){
|
|
|
|
return getTypeList(yysPackageReportPagination, yysPackageReportPagination.getDataType());
|
|
|
|
return getTypeList(yysPackageReportPagination,yysPackageReportPagination.getDataType());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 列表查询
|
|
|
|
* 列表查询
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination, String dataType) {
|
|
|
|
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination,String dataType){
|
|
|
|
String userId = userProvider.get().getUserId();
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
List<String> AllIdList = new ArrayList();
|
|
|
|
List<String> AllIdList =new ArrayList();
|
|
|
|
List<List<String>> intersectionList = new ArrayList<>();
|
|
|
|
List<List<String>> intersectionList =new ArrayList<>();
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
String columnData = !isPc ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData();
|
|
|
|
String columnData = !isPc ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData();
|
|
|
|
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
|
|
|
|
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
|
|
|
|
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
|
|
|
|
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
|
|
|
|
|
|
|
|
|
|
|
|
int total = 0;
|
|
|
|
int total=0;
|
|
|
|
int yysPackageReportNum = 0;
|
|
|
|
int yysPackageReportNum =0;
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper=new QueryWrapper<>();
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
String superOp = "";
|
|
|
|
String superOp ="";
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())) {
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())){
|
|
|
|
List<String> allSuperList = new ArrayList<>();
|
|
|
|
List<String> allSuperList = new ArrayList<>();
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
String queryJson = yysPackageReportPagination.getSuperQueryJson();
|
|
|
|
String queryJson = yysPackageReportPagination.getSuperQueryJson();
|
|
|
|
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
|
|
|
|
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
|
|
|
|
int superNum = 0;
|
|
|
|
int superNum = 0;
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper, YysPackageReportEntity.class, queryJson, "0"));
|
|
|
|
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,queryJson,"0"));
|
|
|
|
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
if (yysPackageReportNum1 > 0) {
|
|
|
|
if (yysPackageReportNum1>0){
|
|
|
|
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
|
|
|
|
List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
|
|
|
|
allSuperList.addAll(yysPackageReportList);
|
|
|
|
allSuperList.addAll(yysPackageReportList);
|
|
|
|
intersectionSuperList.add(yysPackageReportList);
|
|
|
|
intersectionSuperList.add(yysPackageReportList);
|
|
|
|
superNum++;
|
|
|
|
superNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
|
//and or
|
|
|
|
//and or
|
|
|
|
if (superOp.equalsIgnoreCase("and")) {
|
|
|
|
if(superOp.equalsIgnoreCase("and")){
|
|
|
|
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
|
|
|
|
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
|
|
|
|
} else {
|
|
|
|
}else{
|
|
|
|
allSuperIDlist = allSuperList;
|
|
|
|
allSuperIDlist = allSuperList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> allRuleIDlist = new ArrayList<>();
|
|
|
|
List<String> allRuleIDlist = new ArrayList<>();
|
|
|
|
String ruleOp = "";
|
|
|
|
String ruleOp ="";
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)) {
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)){
|
|
|
|
List<String> allRuleList = new ArrayList<>();
|
|
|
|
List<String> allRuleList = new ArrayList<>();
|
|
|
|
List<List<String>> intersectionRuleList = new ArrayList<>();
|
|
|
|
List<List<String>> intersectionRuleList = new ArrayList<>();
|
|
|
|
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
|
|
|
|
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
|
|
|
|
int ruleNum = 0;
|
|
|
|
int ruleNum = 0;
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper, YysPackageReportEntity.class, ruleJson, "0"));
|
|
|
|
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,ruleJson,"0"));
|
|
|
|
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
if (yysPackageReportNum1 > 0) {
|
|
|
|
if (yysPackageReportNum1>0){
|
|
|
|
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
|
|
|
|
List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
|
|
|
|
allRuleList.addAll(yysPackageReportList);
|
|
|
|
allRuleList.addAll(yysPackageReportList);
|
|
|
|
intersectionRuleList.add(yysPackageReportList);
|
|
|
|
intersectionRuleList.add(yysPackageReportList);
|
|
|
|
ruleNum++;
|
|
|
|
ruleNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
|
//and or
|
|
|
|
//and or
|
|
|
|
if (ruleOp.equalsIgnoreCase("and")) {
|
|
|
|
if(ruleOp.equalsIgnoreCase("and")){
|
|
|
|
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
|
|
|
|
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
|
|
|
|
} else {
|
|
|
|
}else{
|
|
|
|
allRuleIDlist = allRuleList;
|
|
|
|
allRuleIDlist = allRuleList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
boolean pcPermission = false;
|
|
|
|
boolean pcPermission = false;
|
|
|
|
boolean appPermission = false;
|
|
|
|
boolean appPermission = false;
|
|
|
|
if (isPc && pcPermission) {
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
Object yysPackageReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper, YysPackageReportEntity.class, yysPackageReportPagination.getMenuId(), "0"));
|
|
|
|
Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
|
|
|
|
if (ObjectUtil.isEmpty(yysPackageReportObj)) {
|
|
|
|
if (ObjectUtil.isEmpty(yysPackageReportObj)){
|
|
|
|
return new ArrayList<>();
|
|
|
|
return new ArrayList<>();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>) yysPackageReportObj;
|
|
|
|
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
|
|
|
|
if (yysPackageReportQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!isPc && appPermission) {
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
Object yysPackageReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper, YysPackageReportEntity.class, yysPackageReportPagination.getMenuId(), "0"));
|
|
|
|
Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
|
|
|
|
if (ObjectUtil.isEmpty(yysPackageReportObj)) {
|
|
|
|
if (ObjectUtil.isEmpty(yysPackageReportObj)){
|
|
|
|
return new ArrayList<>();
|
|
|
|
return new ArrayList<>();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>) yysPackageReportObj;
|
|
|
|
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
|
|
|
|
if (yysPackageReportQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -166,11 +153,11 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (isPc) {
|
|
|
|
if(isPc){
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())) {
|
|
|
|
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
|
|
|
|
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysPackageReportPagination.getManufactureTime(), String.class);
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysPackageReportPagination.getManufactureTime(),String.class);
|
|
|
|
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
|
|
|
|
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
|
|
|
|
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
|
|
|
|
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
|
|
|
|
|
|
|
|
|
|
|
|
@ -180,59 +167,59 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())) {
|
|
|
|
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
|
|
|
|
|
|
|
|
String value = yysPackageReportPagination.getProductName() instanceof List ?
|
|
|
|
String value = yysPackageReportPagination.getProductName() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) :
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) :
|
|
|
|
String.valueOf(yysPackageReportPagination.getProductName());
|
|
|
|
String.valueOf(yysPackageReportPagination.getProductName());
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductName, value);
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductName,value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductCode())) {
|
|
|
|
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductCode())){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
|
|
|
|
|
|
|
|
String value = yysPackageReportPagination.getProductCode() instanceof List ?
|
|
|
|
String value = yysPackageReportPagination.getProductCode() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) :
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) :
|
|
|
|
String.valueOf(yysPackageReportPagination.getProductCode());
|
|
|
|
String.valueOf(yysPackageReportPagination.getProductCode());
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductCode, value);
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductCode,value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getDeviceName())) {
|
|
|
|
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getDeviceName())){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
|
|
|
|
|
|
|
|
String value = yysPackageReportPagination.getDeviceName() instanceof List ?
|
|
|
|
String value = yysPackageReportPagination.getDeviceName() instanceof List ?
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) :
|
|
|
|
JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) :
|
|
|
|
String.valueOf(yysPackageReportPagination.getDeviceName());
|
|
|
|
String.valueOf(yysPackageReportPagination.getDeviceName());
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getDeviceName, value);
|
|
|
|
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getDeviceName,value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getStatus())) {
|
|
|
|
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getStatus())){
|
|
|
|
yysPackageReportNum++;
|
|
|
|
yysPackageReportNum++;
|
|
|
|
|
|
|
|
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(), String[][].class);
|
|
|
|
String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(),String[][].class);
|
|
|
|
for (int i = 0; i < status.length; i++) {
|
|
|
|
for(int i=0;i<status.length;i++){
|
|
|
|
if (status[i].length > 0) {
|
|
|
|
if(status[i].length>0){
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e1) {
|
|
|
|
}catch (Exception e1){
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(), String.class);
|
|
|
|
List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(),String.class);
|
|
|
|
if (status.size() > 0) {
|
|
|
|
if(status.size()>0){
|
|
|
|
idList.addAll(status);
|
|
|
|
idList.addAll(status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e2) {
|
|
|
|
}catch (Exception e2){
|
|
|
|
idList.add(String.valueOf(yysPackageReportPagination.getStatus()));
|
|
|
|
idList.add(String.valueOf(yysPackageReportPagination.getStatus()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t -> {
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t->{
|
|
|
|
idList.forEach(tt -> {
|
|
|
|
idList.forEach(tt->{
|
|
|
|
t.like(YysPackageReportEntity::getStatus, tt).or();
|
|
|
|
t.like(YysPackageReportEntity::getStatus, tt).or();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -241,131 +228,118 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
if (total > 0) {
|
|
|
|
if (total>0){
|
|
|
|
if (intersection.size() == 0) {
|
|
|
|
if (intersection.size()==0){
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection);
|
|
|
|
yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//是否有高级查询
|
|
|
|
//是否有高级查询
|
|
|
|
if (StringUtil.isNotEmpty(superOp)) {
|
|
|
|
if (StringUtil.isNotEmpty(superOp)){
|
|
|
|
if (allSuperIDlist.size() == 0) {
|
|
|
|
if (allSuperIDlist.size()==0){
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t -> t.in(YysPackageReportEntity::getId, finalAllSuperIDlist));
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllSuperIDlist));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//是否有数据过滤查询
|
|
|
|
//是否有数据过滤查询
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)) {
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)){
|
|
|
|
if (allRuleIDlist.size() == 0) {
|
|
|
|
if (allRuleIDlist.size()==0){
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> finalAllRuleIDlist = allRuleIDlist;
|
|
|
|
List<String> finalAllRuleIDlist = allRuleIDlist;
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t -> t.in(YysPackageReportEntity::getId, finalAllRuleIDlist));
|
|
|
|
yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllRuleIDlist));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//假删除标志
|
|
|
|
//假删除标志
|
|
|
|
yysPackageReportQueryWrapper.lambda().isNull(YysPackageReportEntity::getDeleteMark);
|
|
|
|
yysPackageReportQueryWrapper.lambda().isNull(YysPackageReportEntity::getDeleteMark);
|
|
|
|
|
|
|
|
|
|
|
|
//排序
|
|
|
|
//排序
|
|
|
|
yysPackageReportQueryWrapper.last("ORDER BY CAST(sort AS UNSIGNED)");
|
|
|
|
if(StringUtil.isEmpty(yysPackageReportPagination.getSidx())){
|
|
|
|
// if (StringUtil.isEmpty(yysPackageReportPagination.getSidx())) {
|
|
|
|
yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
|
|
|
|
// yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
|
|
|
|
}else{
|
|
|
|
// } else {
|
|
|
|
try {
|
|
|
|
// try {
|
|
|
|
String sidx = yysPackageReportPagination.getSidx();
|
|
|
|
// String sidx = yysPackageReportPagination.getSidx();
|
|
|
|
String[] strs= sidx.split("_name");
|
|
|
|
// String[] strs = sidx.split("_name");
|
|
|
|
YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
|
|
|
|
// YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
|
|
|
|
Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
// Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
// declaredField.setAccessible(true);
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
// String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
yysPackageReportQueryWrapper="asc".equals(yysPackageReportPagination.getSort().toLowerCase())?yysPackageReportQueryWrapper.orderByAsc(value):yysPackageReportQueryWrapper.orderByDesc(value);
|
|
|
|
// yysPackageReportQueryWrapper = "asc".equals(yysPackageReportPagination.getSort().toLowerCase()) ? yysPackageReportQueryWrapper.orderByAsc(value) : yysPackageReportQueryWrapper.orderByDesc(value);
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
// } catch (NoSuchFieldException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
// e.printStackTrace();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
if("0".equals(dataType)){
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
if((total>0 && AllIdList.size()>0) || total==0){
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
Page<YysPackageReportEntity> page=new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
|
|
|
|
Page<YysPackageReportEntity> page = new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
|
|
|
|
IPage<YysPackageReportEntity> userIPage=this.page(page, yysPackageReportQueryWrapper);
|
|
|
|
IPage<YysPackageReportEntity> userIPage = this.page(page, yysPackageReportQueryWrapper);
|
|
|
|
return yysPackageReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
return yysPackageReportPagination.setData(userIPage.getRecords(), userIPage.getTotal());
|
|
|
|
}else{
|
|
|
|
} else {
|
|
|
|
|
|
|
|
List<YysPackageReportEntity> list = new ArrayList();
|
|
|
|
List<YysPackageReportEntity> list = new ArrayList();
|
|
|
|
return yysPackageReportPagination.setData(list, list.size());
|
|
|
|
return yysPackageReportPagination.setData(list, list.size());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
}else{
|
|
|
|
return this.list(yysPackageReportQueryWrapper);
|
|
|
|
return this.list(yysPackageReportQueryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public YysPackageReportEntity getInfo(String id) {
|
|
|
|
public YysPackageReportEntity getInfo(String id){
|
|
|
|
QueryWrapper<YysPackageReportEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<YysPackageReportEntity> queryWrapper=new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(YysPackageReportEntity::getId, id);
|
|
|
|
queryWrapper.lambda().eq(YysPackageReportEntity::getId,id);
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void create(YysPackageReportEntity entity) {
|
|
|
|
public void create(YysPackageReportEntity entity){
|
|
|
|
this.save(entity);
|
|
|
|
this.save(entity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean update(String id, YysPackageReportEntity entity) {
|
|
|
|
public boolean update(String id, YysPackageReportEntity entity){
|
|
|
|
return this.updateById(entity);
|
|
|
|
return this.updateById(entity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void delete(YysPackageReportEntity entity) {
|
|
|
|
public void delete(YysPackageReportEntity entity){
|
|
|
|
if (entity != null) {
|
|
|
|
if(entity!=null){
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 验证表单唯一字段，正则，非空 i-0新增-1修改
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public String checkForm(YysPackageReportForm form, int i) {
|
|
|
|
public String checkForm(YysPackageReportForm form,int i) {
|
|
|
|
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
String id = "";
|
|
|
|
String id="";
|
|
|
|
String countRecover = "";
|
|
|
|
String countRecover = "";
|
|
|
|
if (isUp) {
|
|
|
|
if (isUp){
|
|
|
|
id = form.getId();
|
|
|
|
id = form.getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//主表字段验证
|
|
|
|
//主表字段验证
|
|
|
|
if (StringUtil.isEmpty(form.getDeviceName())) {
|
|
|
|
if(StringUtil.isEmpty(form.getDeviceName())){
|
|
|
|
return "设备名称不能为空";
|
|
|
|
return "设备名称不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtil.isEmpty(form.getProductCode())) {
|
|
|
|
if(StringUtil.isEmpty(form.getProductName())){
|
|
|
|
return "产品编码不能为空";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StringUtil.isEmpty(form.getProductName())) {
|
|
|
|
|
|
|
|
return "产品名称不能为空";
|
|
|
|
return "产品名称不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtil.isEmpty(form.getModels())) {
|
|
|
|
if(StringUtil.isEmpty(form.getModels())){
|
|
|
|
return "规格型号不能为空";
|
|
|
|
return "规格型号不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtil.isEmpty(form.getMeasurementUnit())) {
|
|
|
|
if(StringUtil.isEmpty(form.getMeasurementUnit())){
|
|
|
|
return "计量单位不能为空";
|
|
|
|
return "计量单位不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return countRecover;
|
|
|
|
return countRecover;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param id
|
|
|
|
* @param id
|
|
|
|
* @param yysPackageReportForm
|
|
|
|
* @param yysPackageReportForm
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public void saveOrUpdate(YysPackageReportForm yysPackageReportForm, String id, boolean isSave) throws Exception {
|
|
|
|
public void saveOrUpdate(YysPackageReportForm yysPackageReportForm,String id, boolean isSave) throws Exception{
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
|
|
|
|
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
|
|
|
|
yysPackageReportForm = JsonUtil.getJsonToBean(
|
|
|
|
yysPackageReportForm = JsonUtil.getJsonToBean(
|
|
|
|
generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(), yysPackageReportForm), YysPackageReportForm.class);
|
|
|
|
generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(),yysPackageReportForm),YysPackageReportForm.class);
|
|
|
|
YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.class);
|
|
|
|
YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.class);
|
|
|
|
|
|
|
|
|
|
|
|
if (isSave) {
|
|
|
|
if (isSave) {
|
|
|
|
|
jiyufei
2 months ago