yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

month

Browse Source
master
zengchenxi 3 months ago
parent d98fbb681b
commit 5f03fabb38
4 changed files with 182 additions and 141 deletions
Show Stats Download Patch File Download Diff File

3
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMonthlyProductionService.java
Unescape View File

@ -4,7 +4,6 @@ import jnpf.model.yysmonthlyproduction.*;
import jnpf.entity.*; import jnpf.entity.*;
import java.util.*; import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/** /**
* yysMonthlyProduction * yysMonthlyProduction
@ -30,6 +29,6 @@ public interface YysMonthlyProductionService extends IService<YysMonthlyProducti
//副表数据方法 //副表数据方法
String checkForm(YysMonthlyProductionForm form,int i); String checkForm(YysMonthlyProductionForm form,int i);
void saveOrUpdate(YysMonthlyProductionForm yysMonthlyProductionForm,String id, boolean isSave) throws Exception; String saveOrUpdate(YysMonthlyProductionForm yysMonthlyProductionForm, String id, boolean isSave) ;
} }

312
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMonthlyProductionServiceImpl.java
Unescape View File

@ -1,23 +1,23 @@
package jnpf.service.impl; package jnpf.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.mapper.YysMonthlyProductionMapper; import jnpf.mapper.YysMonthlyProductionMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysmonthlyproduction.*; import jnpf.model.yysmonthlyproduction.*;
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.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 java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service; 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 jnpf.database.model.superQuery.SuperJsonModel;
@ -25,13 +25,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; 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.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* yysMonthlyProduction * yysMonthlyProduction
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +40,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-08-06 * 日期： 2024-08-06
*/ */
@Service @Service
public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProductionMapper, YysMonthlyProductionEntity> implements YysMonthlyProductionService{ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProductionMapper, YysMonthlyProductionEntity> implements YysMonthlyProductionService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -47,246 +48,291 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
private UserProvider userProvider; private UserProvider userProvider;
@Override @Override
public List<YysMonthlyProductionEntity> getList(YysMonthlyProductionPagination yysMonthlyProductionPagination){ public List<YysMonthlyProductionEntity> getList(YysMonthlyProductionPagination yysMonthlyProductionPagination) {
return getTypeList(yysMonthlyProductionPagination,yysMonthlyProductionPagination.getDataType()); // QueryWrapper<YysMonthlyProductionEntity> wrapper = new QueryWrapper<>();
// if (ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getYears())) {
// wrapper.lambda().eq(YysMonthlyProductionEntity::getYears, yysMonthlyProductionPagination.getYears().toString());
// }
// wrapper.lambda().isNull(YysMonthlyProductionEntity::getDeleteMark);
// wrapper.last("ORDER BY CAST(day AS UNSIGNED)");
// Page<YysMonthlyProductionEntity> page = new Page<>(yysMonthlyProductionPagination.getCurrentPage(), yysMonthlyProductionPagination.getPageSize());
// IPage<YysMonthlyProductionEntity> userIPage = this.page(page, wrapper);
// return yysMonthlyProductionPagination.setData(userIPage.getRecords(), userIPage.getTotal());
return getTypeList(yysMonthlyProductionPagination, yysMonthlyProductionPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<YysMonthlyProductionEntity> getTypeList(YysMonthlyProductionPagination yysMonthlyProductionPagination,String dataType){ public List<YysMonthlyProductionEntity> getTypeList(YysMonthlyProductionPagination yysMonthlyProductionPagination, 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 ? YysMonthlyProductionConstant.getAppColumnData() : YysMonthlyProductionConstant.getColumnData(); String columnData = !isPc ? YysMonthlyProductionConstant.getAppColumnData() : YysMonthlyProductionConstant.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 yysMonthlyProductionNum =0; int yysMonthlyProductionNum = 0;
QueryWrapper<YysMonthlyProductionEntity> yysMonthlyProductionQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMonthlyProductionEntity> yysMonthlyProductionQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.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 = yysMonthlyProductionPagination.getSuperQueryJson(); String queryJson = yysMonthlyProductionPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysMonthlyProductionEntity> yysMonthlyProductionSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMonthlyProductionEntity> yysMonthlyProductionSuperWrapper = new QueryWrapper<>();
yysMonthlyProductionSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMonthlyProductionSuperWrapper,YysMonthlyProductionEntity.class,queryJson,"0")); yysMonthlyProductionSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMonthlyProductionSuperWrapper, YysMonthlyProductionEntity.class, queryJson, "0"));
int yysMonthlyProductionNum1 = yysMonthlyProductionSuperWrapper.getExpression().getNormal().size(); int yysMonthlyProductionNum1 = yysMonthlyProductionSuperWrapper.getExpression().getNormal().size();
if (yysMonthlyProductionNum1>0){ if (yysMonthlyProductionNum1 > 0) {
List<String> yysMonthlyProductionList =this.list(yysMonthlyProductionSuperWrapper).stream().map(YysMonthlyProductionEntity::getId).collect(Collectors.toList()); List<String> yysMonthlyProductionList = this.list(yysMonthlyProductionSuperWrapper).stream().map(YysMonthlyProductionEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysMonthlyProductionList); allSuperList.addAll(yysMonthlyProductionList);
intersectionSuperList.add(yysMonthlyProductionList); intersectionSuperList.add(yysMonthlyProductionList);
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<YysMonthlyProductionEntity> yysMonthlyProductionSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMonthlyProductionEntity> yysMonthlyProductionSuperWrapper = new QueryWrapper<>();
yysMonthlyProductionSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMonthlyProductionSuperWrapper,YysMonthlyProductionEntity.class,ruleJson,"0")); yysMonthlyProductionSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMonthlyProductionSuperWrapper, YysMonthlyProductionEntity.class, ruleJson, "0"));
int yysMonthlyProductionNum1 = yysMonthlyProductionSuperWrapper.getExpression().getNormal().size(); int yysMonthlyProductionNum1 = yysMonthlyProductionSuperWrapper.getExpression().getNormal().size();
if (yysMonthlyProductionNum1>0){ if (yysMonthlyProductionNum1 > 0) {
List<String> yysMonthlyProductionList =this.list(yysMonthlyProductionSuperWrapper).stream().map(YysMonthlyProductionEntity::getId).collect(Collectors.toList()); List<String> yysMonthlyProductionList = this.list(yysMonthlyProductionSuperWrapper).stream().map(YysMonthlyProductionEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysMonthlyProductionList); allRuleList.addAll(yysMonthlyProductionList);
intersectionRuleList.add(yysMonthlyProductionList); intersectionRuleList.add(yysMonthlyProductionList);
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 yysMonthlyProductionObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMonthlyProductionQueryWrapper,YysMonthlyProductionEntity.class,yysMonthlyProductionPagination.getMenuId(),"0")); Object yysMonthlyProductionObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMonthlyProductionQueryWrapper, YysMonthlyProductionEntity.class, yysMonthlyProductionPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMonthlyProductionObj)){ if (ObjectUtil.isEmpty(yysMonthlyProductionObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMonthlyProductionQueryWrapper = (QueryWrapper<YysMonthlyProductionEntity>)yysMonthlyProductionObj; yysMonthlyProductionQueryWrapper = (QueryWrapper<YysMonthlyProductionEntity>) yysMonthlyProductionObj;
if( yysMonthlyProductionQueryWrapper.getExpression().getNormal().size()>0){ if (yysMonthlyProductionQueryWrapper.getExpression().getNormal().size() > 0) {
yysMonthlyProductionNum++; yysMonthlyProductionNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysMonthlyProductionObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMonthlyProductionQueryWrapper,YysMonthlyProductionEntity.class,yysMonthlyProductionPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMonthlyProductionObj)){
return new ArrayList<>();
} else {
yysMonthlyProductionQueryWrapper = (QueryWrapper<YysMonthlyProductionEntity>)yysMonthlyProductionObj;
if( yysMonthlyProductionQueryWrapper.getExpression().getNormal().size()>0){
yysMonthlyProductionNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysMonthlyProductionObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMonthlyProductionQueryWrapper, YysMonthlyProductionEntity.class, yysMonthlyProductionPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMonthlyProductionObj)) {
return new ArrayList<>();
} else {
yysMonthlyProductionQueryWrapper = (QueryWrapper<YysMonthlyProductionEntity>) yysMonthlyProductionObj;
if (yysMonthlyProductionQueryWrapper.getExpression().getNormal().size() > 0) {
yysMonthlyProductionNum++;
}
}
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getYears())){ if (ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getYears())) {
yysMonthlyProductionNum++; yysMonthlyProductionNum++;
String value = yysMonthlyProductionPagination.getYears() instanceof List ? String value = yysMonthlyProductionPagination.getYears() instanceof List ?
JsonUtil.getObjectToString(yysMonthlyProductionPagination.getYears()) : JsonUtil.getObjectToString(yysMonthlyProductionPagination.getYears()) :
String.valueOf(yysMonthlyProductionPagination.getYears()); String.valueOf(yysMonthlyProductionPagination.getYears());
yysMonthlyProductionQueryWrapper.lambda().eq(YysMonthlyProductionEntity::getYears,value); yysMonthlyProductionQueryWrapper.lambda().eq(YysMonthlyProductionEntity::getYears, value);
} }
if(ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getProductId())){ if (ObjectUtil.isNotEmpty(yysMonthlyProductionPagination.getProductId())) {
yysMonthlyProductionNum++; yysMonthlyProductionNum++;
String value = yysMonthlyProductionPagination.getProductId() instanceof List ? String value = yysMonthlyProductionPagination.getProductId() instanceof List ?
JsonUtil.getObjectToString(yysMonthlyProductionPagination.getProductId()) : JsonUtil.getObjectToString(yysMonthlyProductionPagination.getProductId()) :
String.valueOf(yysMonthlyProductionPagination.getProductId()); String.valueOf(yysMonthlyProductionPagination.getProductId());
yysMonthlyProductionQueryWrapper.lambda().like(YysMonthlyProductionEntity::getProductId,value); yysMonthlyProductionQueryWrapper.lambda().like(YysMonthlyProductionEntity::getProductId, value);
} }
} }
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");
} }
yysMonthlyProductionQueryWrapper.lambda().in(YysMonthlyProductionEntity::getId, intersection); yysMonthlyProductionQueryWrapper.lambda().in(YysMonthlyProductionEntity::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;
yysMonthlyProductionQueryWrapper.lambda().and(t->t.in(YysMonthlyProductionEntity::getId, finalAllSuperIDlist)); yysMonthlyProductionQueryWrapper.lambda().and(t -> t.in(YysMonthlyProductionEntity::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;
yysMonthlyProductionQueryWrapper.lambda().and(t->t.in(YysMonthlyProductionEntity::getId, finalAllRuleIDlist)); yysMonthlyProductionQueryWrapper.lambda().and(t -> t.in(YysMonthlyProductionEntity::getId, finalAllRuleIDlist));
} }
//排序 //排序
if(StringUtil.isEmpty(yysMonthlyProductionPagination.getSidx())){ if (StringUtil.isEmpty(yysMonthlyProductionPagination.getSidx())) {
yysMonthlyProductionQueryWrapper.lambda().orderByDesc(YysMonthlyProductionEntity::getId); yysMonthlyProductionQueryWrapper.lambda().orderByDesc(YysMonthlyProductionEntity::getId);
}else{ } else {
try { try {
String sidx = yysMonthlyProductionPagination.getSidx(); String sidx = yysMonthlyProductionPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
YysMonthlyProductionEntity yysMonthlyProductionEntity = new YysMonthlyProductionEntity(); YysMonthlyProductionEntity yysMonthlyProductionEntity = new YysMonthlyProductionEntity();
Field declaredField = yysMonthlyProductionEntity.getClass().getDeclaredField(strs[0]); Field declaredField = yysMonthlyProductionEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
yysMonthlyProductionQueryWrapper="asc".equals(yysMonthlyProductionPagination.getSort().toLowerCase())?yysMonthlyProductionQueryWrapper.orderByAsc(value):yysMonthlyProductionQueryWrapper.orderByDesc(value); yysMonthlyProductionQueryWrapper = "asc".equals(yysMonthlyProductionPagination.getSort().toLowerCase()) ? yysMonthlyProductionQueryWrapper.orderByAsc(value) : yysMonthlyProductionQueryWrapper.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<YysMonthlyProductionEntity> page=new Page<>(yysMonthlyProductionPagination.getCurrentPage(), yysMonthlyProductionPagination.getPageSize()); Page<YysMonthlyProductionEntity> page = new Page<>(yysMonthlyProductionPagination.getCurrentPage(), yysMonthlyProductionPagination.getPageSize());
IPage<YysMonthlyProductionEntity> userIPage=this.page(page, yysMonthlyProductionQueryWrapper); IPage<YysMonthlyProductionEntity> userIPage = this.page(page, yysMonthlyProductionQueryWrapper);
return yysMonthlyProductionPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysMonthlyProductionPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysMonthlyProductionEntity> list = new ArrayList(); List<YysMonthlyProductionEntity> list = new ArrayList();
return yysMonthlyProductionPagination.setData(list, list.size()); return yysMonthlyProductionPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysMonthlyProductionQueryWrapper); return this.list(yysMonthlyProductionQueryWrapper);
} }
} }
@Override @Override
public YysMonthlyProductionEntity getInfo(String id){ public YysMonthlyProductionEntity getInfo(String id) {
QueryWrapper<YysMonthlyProductionEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysMonthlyProductionEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMonthlyProductionEntity::getId,id); queryWrapper.lambda().eq(YysMonthlyProductionEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysMonthlyProductionEntity entity){ public void create(YysMonthlyProductionEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysMonthlyProductionEntity entity){ public boolean update(String id, YysMonthlyProductionEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysMonthlyProductionEntity entity){ public void delete(YysMonthlyProductionEntity 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(YysMonthlyProductionForm form,int i) { public String checkForm(YysMonthlyProductionForm 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.getYears())){ if (StringUtil.isEmpty(form.getYears())) {
return "年月不能为空"; return "年月不能为空";
} }
if(StringUtil.isEmpty(form.getProductId())){ if (StringUtil.isEmpty(form.getProductId())) {
return "产品编码不能为空"; return "产品编码不能为空";
} }
if(StringUtil.isEmpty(form.getModel())){ if (StringUtil.isEmpty(form.getModel())) {
return "规格型号不能为空"; return "规格型号不能为空";
} }
if(StringUtil.isEmpty(form.getMeasurementUnit())){ if (StringUtil.isEmpty(form.getMeasurementUnit())) {
return "计量单位不能为空"; return "计量单位不能为空";
} }
if(StringUtil.isEmpty(form.getCurrentInventory())){ if (StringUtil.isEmpty(form.getCurrentInventory())) {
return "当前库存不能为空"; return "当前库存不能为空";
} }
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* @param id *
* @param yysMonthlyProductionForm * @param id
* @return * @param yysMonthlyProductionForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysMonthlyProductionForm yysMonthlyProductionForm,String id, boolean isSave) throws Exception{ public String saveOrUpdate(YysMonthlyProductionForm yysMonthlyProductionForm, String id, boolean isSave) {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
LambdaQueryWrapper<YysMonthlyProductionEntity> wrapper = new LambdaQueryWrapper<>(YysMonthlyProductionEntity.class);
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysMonthlyProductionForm = JsonUtil.getJsonToBean( yysMonthlyProductionForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysMonthlyProductionConstant.getFormData(),yysMonthlyProductionForm),YysMonthlyProductionForm.class); generaterSwapUtil.swapDatetime(YysMonthlyProductionConstant.getFormData(), yysMonthlyProductionForm), YysMonthlyProductionForm.class);
YysMonthlyProductionEntity entity = JsonUtil.getJsonToBean(yysMonthlyProductionForm, YysMonthlyProductionEntity.class); YysMonthlyProductionEntity entity = JsonUtil.getJsonToBean(yysMonthlyProductionForm, YysMonthlyProductionEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; wrapper.eq(YysMonthlyProductionEntity::getYears, yysMonthlyProductionForm.getYears());
wrapper.eq(YysMonthlyProductionEntity::getProductName, yysMonthlyProductionForm.getProductName());
if (CollectionUtils.isNotEmpty(this.list(wrapper))) {
return "所选年月与产品已被创建";
}
String mainId = RandomUtil.uuId();
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId); entity.setId(mainId);
}else{
} else {
wrapper.ne(YysMonthlyProductionEntity::getYears, yysMonthlyProductionForm.getYears());
wrapper.ne(YysMonthlyProductionEntity::getProductName, yysMonthlyProductionForm.getProductName());
if (CollectionUtils.isNotEmpty(this.list(wrapper))) {
return "所选年月与产品已被创建";
}
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
}
boolean result = this.saveOrUpdate(entity);
if (result) {
return "操作成功";
} }
this.saveOrUpdate(entity); return "操作失败";
} }
} }

7
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java
Unescape View File

@ -117,12 +117,7 @@ public class YysMonthlyProductionController {
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b ); return ActionResult.fail(b );
} }
try{ return ActionResult.success(yysMonthlyProductionService.saveOrUpdate(yysMonthlyProductionForm, null, true));
yysMonthlyProductionService.saveOrUpdate(yysMonthlyProductionForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
} }
/** /**
* 导出Excel * 导出Excel

1
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue
Unescape View File

@ -346,6 +346,7 @@ export default {
//初始化默认数据 //初始化默认数据
initDefaultData() { initDefaultData() {
this.dataForm.deliveryTime = new Date().getTime() this.dataForm.deliveryTime = new Date().getTime()
this.dataForm.years = new Date().getTime()
}, },
// 表单提交 // 表单提交

Write Preview
Loading…
Cancel
Save