|
|
|
@ -1,62 +1,46 @@
|
|
|
|
|
package jnpf.service.impl;
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.mapper.YysProdReportMapper;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.model.yysprodreport.*;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
|
|
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 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.conditions.query.QueryWrapper;
|
|
|
|
|
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.core.conditions.query.QueryWrapper;
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
import jnpf.entity.YysProdReportEntity;
|
|
|
|
|
import jnpf.mapper.YysProdReportMapper;
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
import jnpf.model.yysprodreport.YysProdReportConstant;
|
|
|
|
|
import jnpf.model.yysprodreport.YysProdReportForm;
|
|
|
|
|
import jnpf.model.yysprodreport.YysProdReportPagination;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.service.YysDayLogsService;
|
|
|
|
|
import jnpf.service.YysProdReportService;
|
|
|
|
|
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 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;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* yysProdReport
|
|
|
|
|
* 版本: V3.5
|
|
|
|
|
* 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
|
* 作者: JNPF开发平台组
|
|
|
|
|
* 日期: 2024-08-07
|
|
|
|
|
* 日期: 2024-08-19
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
@Slf4j
|
|
|
|
|
public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, YysProdReportEntity> implements YysProdReportService {
|
|
|
|
|
public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, YysProdReportEntity> implements YysProdReportService{
|
|
|
|
|
@Autowired
|
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
|
|
|
|
@ -67,98 +51,95 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
|
|
|
|
|
private YysDayLogsService yysDayLogsService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination) {
|
|
|
|
|
return getTypeList(yysProdReportPagination, yysProdReportPagination.getDataType());
|
|
|
|
|
public List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination){
|
|
|
|
|
return getTypeList(yysProdReportPagination,yysProdReportPagination.getDataType());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表查询
|
|
|
|
|
*/
|
|
|
|
|
/** 列表查询 */
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination, String dataType) {
|
|
|
|
|
String userId = userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList = new ArrayList();
|
|
|
|
|
List<List<String>> intersectionList = new ArrayList<>();
|
|
|
|
|
public List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination,String dataType){
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList =new ArrayList();
|
|
|
|
|
List<List<String>> intersectionList =new ArrayList<>();
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
String columnData = !isPc ? YysProdReportConstant.getAppColumnData() : YysProdReportConstant.getColumnData();
|
|
|
|
|
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
|
|
|
|
|
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
|
|
|
|
|
|
|
|
|
|
int total = 0;
|
|
|
|
|
int yysProdReportNum = 0;
|
|
|
|
|
QueryWrapper<YysProdReportEntity> yysProdReportQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
int total=0;
|
|
|
|
|
int yysProdReportNum =0;
|
|
|
|
|
QueryWrapper<YysProdReportEntity> yysProdReportQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
|
String superOp = "";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getSuperQueryJson())) {
|
|
|
|
|
String superOp ="";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getSuperQueryJson())){
|
|
|
|
|
List<String> allSuperList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
|
String queryJson = yysProdReportPagination.getSuperQueryJson();
|
|
|
|
|
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
|
|
|
|
|
int superNum = 0;
|
|
|
|
|
QueryWrapper<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
|
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper, YysProdReportEntity.class, queryJson, "0"));
|
|
|
|
|
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper,YysProdReportEntity.class,queryJson,"0"));
|
|
|
|
|
int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
|
if (yysProdReportNum1 > 0) {
|
|
|
|
|
List<String> yysProdReportList = this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysProdReportNum1>0){
|
|
|
|
|
List<String> yysProdReportList =this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allSuperList.addAll(yysProdReportList);
|
|
|
|
|
intersectionSuperList.add(yysProdReportList);
|
|
|
|
|
superNum++;
|
|
|
|
|
}
|
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
|
|
//and or
|
|
|
|
|
if (superOp.equalsIgnoreCase("and")) {
|
|
|
|
|
if(superOp.equalsIgnoreCase("and")){
|
|
|
|
|
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
|
|
|
|
|
} else {
|
|
|
|
|
}else{
|
|
|
|
|
allSuperIDlist = allSuperList;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<String> allRuleIDlist = new ArrayList<>();
|
|
|
|
|
String ruleOp = "";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)) {
|
|
|
|
|
String ruleOp ="";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)){
|
|
|
|
|
List<String> allRuleList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionRuleList = new ArrayList<>();
|
|
|
|
|
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
|
|
|
|
|
int ruleNum = 0;
|
|
|
|
|
QueryWrapper<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>();
|
|
|
|
|
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper, YysProdReportEntity.class, ruleJson, "0"));
|
|
|
|
|
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper,YysProdReportEntity.class,ruleJson,"0"));
|
|
|
|
|
int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size();
|
|
|
|
|
if (yysProdReportNum1 > 0) {
|
|
|
|
|
List<String> yysProdReportList = this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysProdReportNum1>0){
|
|
|
|
|
List<String> yysProdReportList =this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allRuleList.addAll(yysProdReportList);
|
|
|
|
|
intersectionRuleList.add(yysProdReportList);
|
|
|
|
|
ruleNum++;
|
|
|
|
|
}
|
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
|
|
//and or
|
|
|
|
|
if (ruleOp.equalsIgnoreCase("and")) {
|
|
|
|
|
if(ruleOp.equalsIgnoreCase("and")){
|
|
|
|
|
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
|
|
|
|
|
} else {
|
|
|
|
|
}else{
|
|
|
|
|
allRuleIDlist = allRuleList;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
boolean pcPermission = false;
|
|
|
|
|
boolean appPermission = false;
|
|
|
|
|
if (isPc && pcPermission) {
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
Object yysProdReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper, YysProdReportEntity.class, yysProdReportPagination.getMenuId(), "0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysProdReportObj)) {
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object yysProdReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper,YysProdReportEntity.class,yysProdReportPagination.getMenuId(),"0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysProdReportObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>) yysProdReportObj;
|
|
|
|
|
if (yysProdReportQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>)yysProdReportObj;
|
|
|
|
|
if( yysProdReportQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!isPc && appPermission) {
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
Object yysProdReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper, YysProdReportEntity.class, yysProdReportPagination.getMenuId(), "0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysProdReportObj)) {
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object yysProdReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper,YysProdReportEntity.class,yysProdReportPagination.getMenuId(),"0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysProdReportObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>) yysProdReportObj;
|
|
|
|
|
if (yysProdReportQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>)yysProdReportObj;
|
|
|
|
|
if( yysProdReportQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -166,11 +147,11 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (isPc) {
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getManufactureTime())) {
|
|
|
|
|
if(isPc){
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysProdReportPagination.getManufactureTime())){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
|
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysProdReportPagination.getManufactureTime(), String.class);
|
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysProdReportPagination.getManufactureTime(),String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
|
|
|
|
|
|
|
|
|
@ -180,59 +161,59 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getProductName())) {
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysProdReportPagination.getProductName())){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
|
|
|
|
|
String value = yysProdReportPagination.getProductName() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysProdReportPagination.getProductName()) :
|
|
|
|
|
String.valueOf(yysProdReportPagination.getProductName());
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductName, value);
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductName,value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getProductCode())) {
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysProdReportPagination.getProductCode())){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
|
|
|
|
|
String value = yysProdReportPagination.getProductCode() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysProdReportPagination.getProductCode()) :
|
|
|
|
|
String.valueOf(yysProdReportPagination.getProductCode());
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductCode, value);
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductCode,value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getDeviceName())) {
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysProdReportPagination.getDeviceName())){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
|
|
|
|
|
String value = yysProdReportPagination.getDeviceName() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysProdReportPagination.getDeviceName()) :
|
|
|
|
|
String.valueOf(yysProdReportPagination.getDeviceName());
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getDeviceName, value);
|
|
|
|
|
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getDeviceName,value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getStatus())) {
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysProdReportPagination.getStatus())){
|
|
|
|
|
yysProdReportNum++;
|
|
|
|
|
|
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
|
try {
|
|
|
|
|
String[][] status = JsonUtil.getJsonToBean(yysProdReportPagination.getStatus(), String[][].class);
|
|
|
|
|
for (int i = 0; i < status.length; i++) {
|
|
|
|
|
if (status[i].length > 0) {
|
|
|
|
|
String[][] status = JsonUtil.getJsonToBean(yysProdReportPagination.getStatus(),String[][].class);
|
|
|
|
|
for(int i=0;i<status.length;i++){
|
|
|
|
|
if(status[i].length>0){
|
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e1) {
|
|
|
|
|
}catch (Exception e1){
|
|
|
|
|
try {
|
|
|
|
|
List<String> status = JsonUtil.getJsonToList(yysProdReportPagination.getStatus(), String.class);
|
|
|
|
|
if (status.size() > 0) {
|
|
|
|
|
List<String> status = JsonUtil.getJsonToList(yysProdReportPagination.getStatus(),String.class);
|
|
|
|
|
if(status.size()>0){
|
|
|
|
|
idList.addAll(status);
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e2) {
|
|
|
|
|
}catch (Exception e2){
|
|
|
|
|
idList.add(String.valueOf(yysProdReportPagination.getStatus()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t -> {
|
|
|
|
|
idList.forEach(tt -> {
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t->{
|
|
|
|
|
idList.forEach(tt->{
|
|
|
|
|
t.like(YysProdReportEntity::getStatus, tt).or();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
@ -241,27 +222,27 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
|
if (total > 0) {
|
|
|
|
|
if (intersection.size() == 0) {
|
|
|
|
|
if (total>0){
|
|
|
|
|
if (intersection.size()==0){
|
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
yysProdReportQueryWrapper.lambda().in(YysProdReportEntity::getId, intersection);
|
|
|
|
|
}
|
|
|
|
|
//是否有高级查询
|
|
|
|
|
if (StringUtil.isNotEmpty(superOp)) {
|
|
|
|
|
if (allSuperIDlist.size() == 0) {
|
|
|
|
|
if (StringUtil.isNotEmpty(superOp)){
|
|
|
|
|
if (allSuperIDlist.size()==0){
|
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t -> t.in(YysProdReportEntity::getId, finalAllSuperIDlist));
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t->t.in(YysProdReportEntity::getId, finalAllSuperIDlist));
|
|
|
|
|
}
|
|
|
|
|
//是否有数据过滤查询
|
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)) {
|
|
|
|
|
if (allRuleIDlist.size() == 0) {
|
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)){
|
|
|
|
|
if (allRuleIDlist.size()==0){
|
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
List<String> finalAllRuleIDlist = allRuleIDlist;
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t -> t.in(YysProdReportEntity::getId, finalAllRuleIDlist));
|
|
|
|
|
yysProdReportQueryWrapper.lambda().and(t->t.in(YysProdReportEntity::getId, finalAllRuleIDlist));
|
|
|
|
|
}
|
|
|
|
|
//假删除标志
|
|
|
|
|
yysProdReportQueryWrapper.lambda().isNull(YysProdReportEntity::getDeleteMark);
|
|
|
|
@ -284,85 +265,73 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
|
Page<YysProdReportEntity> page = new Page<>(yysProdReportPagination.getCurrentPage(), yysProdReportPagination.getPageSize());
|
|
|
|
|
IPage<YysProdReportEntity> userIPage = this.page(page, yysProdReportQueryWrapper);
|
|
|
|
|
return yysProdReportPagination.setData(userIPage.getRecords(), userIPage.getTotal());
|
|
|
|
|
} else {
|
|
|
|
|
if("0".equals(dataType)){
|
|
|
|
|
if((total>0 && AllIdList.size()>0) || total==0){
|
|
|
|
|
Page<YysProdReportEntity> page=new Page<>(yysProdReportPagination.getCurrentPage(), yysProdReportPagination.getPageSize());
|
|
|
|
|
IPage<YysProdReportEntity> userIPage=this.page(page, yysProdReportQueryWrapper);
|
|
|
|
|
return yysProdReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
|
}else{
|
|
|
|
|
List<YysProdReportEntity> list = new ArrayList();
|
|
|
|
|
return yysProdReportPagination.setData(list, list.size());
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
}else{
|
|
|
|
|
return this.list(yysProdReportQueryWrapper);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public YysProdReportEntity getInfo(String id) {
|
|
|
|
|
QueryWrapper<YysProdReportEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysProdReportEntity::getId, id);
|
|
|
|
|
public YysProdReportEntity getInfo(String id){
|
|
|
|
|
QueryWrapper<YysProdReportEntity> queryWrapper=new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysProdReportEntity::getId,id);
|
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void create(YysProdReportEntity entity) {
|
|
|
|
|
public void create(YysProdReportEntity entity){
|
|
|
|
|
this.save(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean update(String id, YysProdReportEntity entity) {
|
|
|
|
|
public boolean update(String id, YysProdReportEntity entity){
|
|
|
|
|
return this.updateById(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void delete(YysProdReportEntity entity) {
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
public void delete(YysProdReportEntity entity){
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 验证表单唯一字段,正则,非空 i-0新增-1修改
|
|
|
|
|
*/
|
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkForm(YysProdReportForm form, int i) {
|
|
|
|
|
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id = "";
|
|
|
|
|
public String checkForm(YysProdReportForm form,int i) {
|
|
|
|
|
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id="";
|
|
|
|
|
String countRecover = "";
|
|
|
|
|
if (isUp) {
|
|
|
|
|
if (isUp){
|
|
|
|
|
id = form.getId();
|
|
|
|
|
}
|
|
|
|
|
//主表字段验证
|
|
|
|
|
if (StringUtil.isEmpty(form.getDeviceName())) {
|
|
|
|
|
if(StringUtil.isEmpty(form.getDeviceName())){
|
|
|
|
|
return "设备名称不能为空";
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isEmpty(form.getProductCode())) {
|
|
|
|
|
return "产品编码不能为空";
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isEmpty(form.getProductName())) {
|
|
|
|
|
if(StringUtil.isEmpty(form.getProductName())){
|
|
|
|
|
return "产品名称不能为空";
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isEmpty(form.getModels())) {
|
|
|
|
|
if(StringUtil.isEmpty(form.getModels())){
|
|
|
|
|
return "规格型号不能为空";
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isEmpty(form.getMeasurementUnit())) {
|
|
|
|
|
if(StringUtil.isEmpty(form.getMeasurementUnit())){
|
|
|
|
|
return "计量单位不能为空";
|
|
|
|
|
}
|
|
|
|
|
return countRecover;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @param yysProdReportForm
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public void saveOrUpdate(YysProdReportForm yysProdReportForm, String id, boolean isSave) throws Exception {
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
public void saveOrUpdate(YysProdReportForm yysProdReportForm,String id, boolean isSave) throws Exception{
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
|
|
|
|
|
yysProdReportForm = JsonUtil.getJsonToBean(
|
|
|
|
|
generaterSwapUtil.swapDatetime(YysProdReportConstant.getFormData(), yysProdReportForm), YysProdReportForm.class);
|
|
|
|
|