diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java index a76bb2c..71f1353 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java @@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialRequirementPlanMapper; import jnpf.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.model.yysmaterialrequirementplan.*; + 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.regex.Pattern; + import jnpf.model.QueryModel; + import java.util.stream.Collectors; + import jnpf.base.model.ColumnDataModel; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,13 +33,17 @@ 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 jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; + /** - * * YysMaterialRequirementPlan * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） @@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity; * 日期： 2024-08-07 */ @Service -public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl implements YysMaterialRequirementPlanService{ +public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl implements YysMaterialRequirementPlanService { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -48,383 +60,405 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){ - return getTypeList(yysMaterialRequirementPlanPagination,yysMaterialRequirementPlanPagination.getDataType()); + public List getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) { + return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType()); } - /** 列表查询 */ + + /** + * 列表查询 + */ @Override - public List getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - List> intersectionList =new ArrayList<>(); + public List getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, String dataType) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + List> intersectionList = new ArrayList<>(); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); String columnData = !isPc ? YysMaterialRequirementPlanConstant.getAppColumnData() : YysMaterialRequirementPlanConstant.getColumnData(); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); - int total=0; - int yysMaterialRequirementPlanNum =0; - QueryWrapper yysMaterialRequirementPlanQueryWrapper=new QueryWrapper<>(); - int yysMaterialRequirementItemNum =0; - QueryWrapper yysMaterialRequirementItemQueryWrapper=new QueryWrapper<>(); + int total = 0; + int yysMaterialRequirementPlanNum = 0; + QueryWrapper yysMaterialRequirementPlanQueryWrapper = new QueryWrapper<>(); + int yysMaterialRequirementItemNum = 0; + QueryWrapper yysMaterialRequirementItemQueryWrapper = new QueryWrapper<>(); long yysMaterialRequirementItemcount = yysMaterialRequirementItemService.count(); List allSuperIDlist = new ArrayList<>(); - String superOp =""; - if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getSuperQueryJson())){ + String superOp = ""; + if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getSuperQueryJson())) { List allSuperList = new ArrayList<>(); - List> intersectionSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); String queryJson = yysMaterialRequirementPlanPagination.getSuperQueryJson(); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); int superNum = 0; QueryWrapper yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>(); - yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper,YysMaterialRequirementPlanEntity.class,queryJson,"0")); + yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper, YysMaterialRequirementPlanEntity.class, queryJson, "0")); int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size(); - if (yysMaterialRequirementPlanNum1>0){ - List yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); + if (yysMaterialRequirementPlanNum1 > 0) { + List yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); allSuperList.addAll(yysMaterialRequirementPlanList); intersectionSuperList.add(yysMaterialRequirementPlanList); superNum++; } String YysMaterialRequirementItemTable = "yys_material_requirement_item"; boolean YysMaterialRequirementItemHasSql = queryJson.contains(YysMaterialRequirementItemTable); - List yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , queryJson, null); - if (YysMaterialRequirementItemHasSql){ + List yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, queryJson, null); + if (YysMaterialRequirementItemHasSql) { allSuperList.addAll(yysMaterialRequirementItemList); intersectionSuperList.add(yysMaterialRequirementItemList); 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 allRuleIDlist = new ArrayList<>(); - String ruleOp =""; - if (ObjectUtil.isNotEmpty(ruleJson)){ + String ruleOp = ""; + if (ObjectUtil.isNotEmpty(ruleJson)) { List allRuleList = new ArrayList<>(); - List> intersectionRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); int ruleNum = 0; QueryWrapper yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>(); - yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper,YysMaterialRequirementPlanEntity.class,ruleJson,"0")); + yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper, YysMaterialRequirementPlanEntity.class, ruleJson, "0")); int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size(); - if (yysMaterialRequirementPlanNum1>0){ - List yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); + if (yysMaterialRequirementPlanNum1 > 0) { + List yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); allRuleList.addAll(yysMaterialRequirementPlanList); intersectionRuleList.add(yysMaterialRequirementPlanList); ruleNum++; } String YysMaterialRequirementItemTable = "yys_material_requirement_item"; boolean YysMaterialRequirementItemHasSql = ruleJson.contains(YysMaterialRequirementItemTable); - List yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , ruleJson, null); - if (YysMaterialRequirementItemHasSql){ + List yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, ruleJson, null); + if (YysMaterialRequirementItemHasSql) { allRuleList.addAll(yysMaterialRequirementItemList); intersectionRuleList.add(yysMaterialRequirementItemList); 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 = true; - boolean appPermission = false; - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object yysMaterialRequirementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper,YysMaterialRequirementPlanEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)){ - return new ArrayList<>(); - } else { - yysMaterialRequirementPlanQueryWrapper = (QueryWrapper)yysMaterialRequirementPlanObj; - if( yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialRequirementPlanNum++; - } - } - Object yysMaterialRequirementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper,YysMaterialRequirementItemEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){ - return new ArrayList<>(); - } else { - yysMaterialRequirementItemQueryWrapper = (QueryWrapper)yysMaterialRequirementItemObj; - if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialRequirementItemNum++; - } - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object yysMaterialRequirementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper,YysMaterialRequirementPlanEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)){ - return new ArrayList<>(); - } else { - yysMaterialRequirementPlanQueryWrapper = (QueryWrapper)yysMaterialRequirementPlanObj; - if( yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialRequirementPlanNum++; - } + boolean pcPermission = true; + boolean appPermission = false; + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysMaterialRequirementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper, YysMaterialRequirementPlanEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)) { + return new ArrayList<>(); + } else { + yysMaterialRequirementPlanQueryWrapper = (QueryWrapper) yysMaterialRequirementPlanObj; + if (yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialRequirementPlanNum++; + } + } + Object yysMaterialRequirementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper, YysMaterialRequirementItemEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) { + return new ArrayList<>(); + } else { + yysMaterialRequirementItemQueryWrapper = (QueryWrapper) yysMaterialRequirementItemObj; + if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialRequirementItemNum++; + } + } + } } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysMaterialRequirementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper, YysMaterialRequirementPlanEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)) { + return new ArrayList<>(); + } else { + yysMaterialRequirementPlanQueryWrapper = (QueryWrapper) yysMaterialRequirementPlanObj; + if (yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialRequirementPlanNum++; + } + } - Object yysMaterialRequirementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper,YysMaterialRequirementItemEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){ - return new ArrayList<>(); - } else { - yysMaterialRequirementItemQueryWrapper = (QueryWrapper)yysMaterialRequirementItemObj; - if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialRequirementItemNum++; - } - } + Object yysMaterialRequirementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper, YysMaterialRequirementItemEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) { + return new ArrayList<>(); + } else { + yysMaterialRequirementItemQueryWrapper = (QueryWrapper) yysMaterialRequirementItemObj; + if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialRequirementItemNum++; + } + } - } - } - if(isPc){ - if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())){ - yysMaterialRequirementPlanNum++; + } + } + if (isPc) { + if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())) { + yysMaterialRequirementPlanNum++; String value = yysMaterialRequirementPlanPagination.getPlanNumber() instanceof List ? - JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) : - String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber()); - yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber,value); + JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) : + String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber()); + yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber, value); } - if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())){ - yysMaterialRequirementPlanNum++; + if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())) { + yysMaterialRequirementPlanNum++; - List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(),String.class); - Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0))); - Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1))); + List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(), String.class); + Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0))); + Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1))); - yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir)) - .le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir)) + .le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())){ - yysMaterialRequirementPlanNum++; + if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())) { + yysMaterialRequirementPlanNum++; - List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(),String.class); - Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0))); - Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1))); + List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(), String.class); + Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0))); + Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1))); - yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir)) - .le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir)) + .le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())){ - yysMaterialRequirementPlanNum++; + if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())) { + yysMaterialRequirementPlanNum++; - List idList = new ArrayList<>(); - try { - String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i]))); - } - } - }catch (Exception e1){ - try { - List isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String.class); - if(isCreatePlan.size()>0){ - idList.addAll(isCreatePlan); - } - }catch (Exception e2){ - idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan())); - } - } - yysMaterialRequirementPlanQueryWrapper.lambda().and(t->{ - idList.forEach(tt->{ - t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or(); - }); - }); + List idList = new ArrayList<>(); + try { + String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String[][].class); + for (int i = 0; i < isCreatePlan.length; i++) { + if (isCreatePlan[i].length > 0) { + idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i]))); + } + } + } catch (Exception e1) { + try { + List isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String.class); + if (isCreatePlan.size() > 0) { + idList.addAll(isCreatePlan); + } + } catch (Exception e2) { + idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan())); + } + } + yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> { + idList.forEach(tt -> { + t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or(); + }); + }); } } - if(yysMaterialRequirementItemNum>0){ - List yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t->t.getMaterialRequirementPlanId()).collect(Collectors.toList()); + if (yysMaterialRequirementItemNum > 0) { + List yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t -> t.getMaterialRequirementPlanId()).collect(Collectors.toList()); long count = yysMaterialRequirementItemService.count(); - if (count>0){ - intersectionList.add(yysMaterialRequirementItemIdList); + if (count > 0) { + intersectionList.add(yysMaterialRequirementItemIdList); } AllIdList.addAll(yysMaterialRequirementItemIdList); - } - total+=yysMaterialRequirementItemNum; + } + total += yysMaterialRequirementItemNum; List intersection = generaterSwapUtil.getIntersection(intersectionList); - if (total>0){ - if (intersection.size()==0){ + if (total > 0) { + if (intersection.size() == 0) { intersection.add("jnpfNullList"); } yysMaterialRequirementPlanQueryWrapper.lambda().in(YysMaterialRequirementPlanEntity::getId, intersection); } - //是否有高级查询 - if (StringUtil.isNotEmpty(superOp)){ - if (allSuperIDlist.size()==0){ + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { allSuperIDlist.add("jnpfNullList"); } List finalAllSuperIDlist = allSuperIDlist; - yysMaterialRequirementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialRequirementPlanEntity::getId, finalAllSuperIDlist)); + yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialRequirementPlanEntity::getId, finalAllSuperIDlist)); } - //是否有数据过滤查询 - if (StringUtil.isNotEmpty(ruleOp)){ - if (allRuleIDlist.size()==0){ + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { allRuleIDlist.add("jnpfNullList"); } List finalAllRuleIDlist = allRuleIDlist; - yysMaterialRequirementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialRequirementPlanEntity::getId, finalAllRuleIDlist)); + yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialRequirementPlanEntity::getId, finalAllRuleIDlist)); } //假删除标志 yysMaterialRequirementPlanQueryWrapper.lambda().isNull(YysMaterialRequirementPlanEntity::getDeleteMark); //排序 - if(StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())){ + if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())) { yysMaterialRequirementPlanQueryWrapper.lambda().orderByDesc(YysMaterialRequirementPlanEntity::getOrderDate); - }else{ + } else { try { String sidx = yysMaterialRequirementPlanPagination.getSidx(); - String[] strs= sidx.split("_name"); + String[] strs = sidx.split("_name"); YysMaterialRequirementPlanEntity yysMaterialRequirementPlanEntity = new YysMaterialRequirementPlanEntity(); Field declaredField = yysMaterialRequirementPlanEntity.getClass().getDeclaredField(strs[0]); declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value(); - yysMaterialRequirementPlanQueryWrapper="asc".equals(yysMaterialRequirementPlanPagination.getSort().toLowerCase())?yysMaterialRequirementPlanQueryWrapper.orderByAsc(value):yysMaterialRequirementPlanQueryWrapper.orderByDesc(value); + yysMaterialRequirementPlanQueryWrapper = "asc".equals(yysMaterialRequirementPlanPagination.getSort().toLowerCase()) ? yysMaterialRequirementPlanQueryWrapper.orderByAsc(value) : yysMaterialRequirementPlanQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize()); - IPage userIPage=this.page(page, yysMaterialRequirementPlanQueryWrapper); - return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize()); + IPage userIPage = this.page(page, yysMaterialRequirementPlanQueryWrapper); + return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return yysMaterialRequirementPlanPagination.setData(list, list.size()); } - }else{ + } else { return this.list(yysMaterialRequirementPlanQueryWrapper); } } + @Override - public YysMaterialRequirementPlanEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId,id); + public YysMaterialRequirementPlanEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId, id); return this.getOne(queryWrapper); } + @Override - public void create(YysMaterialRequirementPlanEntity entity){ + public void create(YysMaterialRequirementPlanEntity entity) { this.save(entity); } + @Override - public boolean update(String id, YysMaterialRequirementPlanEntity entity){ + public boolean update(String id, YysMaterialRequirementPlanEntity entity) { return this.updateById(entity); } + @Override - public void delete(YysMaterialRequirementPlanEntity entity){ - if(entity!=null){ + public void delete(YysMaterialRequirementPlanEntity entity) { + if (entity != null) { this.removeById(entity.getId()); } } - /** YysMaterialRequirementItem子表方法 */ + + /** + * YysMaterialRequirementItem子表方法 + */ @Override - public List getYysMaterialRequirementItemList(String id,YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){ - Map newtabMap=YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet() - .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); - String tableName="yysMaterialRequirementItem"; - tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); + public List getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) { + Map newtabMap = YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet() + .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey())); + String tableName = "yysMaterialRequirementItem"; + tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination,queryWrapper); + queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination, queryWrapper); queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id); - generaterSwapUtil.wrapperHandle(YysMaterialRequirementPlanConstant.getColumnData(), YysMaterialRequirementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialRequirementItemEntity.class,"sub",tableName); + generaterSwapUtil.wrapperHandle(YysMaterialRequirementPlanConstant.getColumnData(), YysMaterialRequirementPlanConstant.getAppColumnData(), queryWrapper, YysMaterialRequirementItemEntity.class, "sub", tableName); return yysMaterialRequirementItemService.list(queryWrapper); } - /** YysMaterialRequirementItem子表方法 */ + /** + * YysMaterialRequirementItem子表方法 + */ @Override - public List getYysMaterialRequirementItemList(String id){ + public List getYysMaterialRequirementItemList(String id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id); return yysMaterialRequirementItemService.list(queryWrapper); } - /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + + /** + * 验证表单唯一字段，正则，非空 i-0新增-1修改 + */ @Override - public String checkForm(YysMaterialRequirementPlanForm form,int i) { - boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); - String id=""; + public String checkForm(YysMaterialRequirementPlanForm 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 (form.getYysMaterialRequirementItemList()!=null){ - for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){ - if(StringUtil.isNotEmpty(t.getMaterialCode())){ - t.setMaterialCode(t.getMaterialCode().trim()); - } - else{ - return "设计子表-物料编码不能为空"; - } - } - for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){ - if(StringUtil.isNotEmpty(t.getMaterialName())){ - t.setMaterialName(t.getMaterialName().trim()); - } - else{ - return "设计子表-物料名称不能为空"; - } - } + if (form.getYysMaterialRequirementItemList() != null) { + for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) { + if (StringUtil.isNotEmpty(t.getMaterialCode())) { + t.setMaterialCode(t.getMaterialCode().trim()); + } else { + return "设计子表-物料编码不能为空"; + } + } + for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) { + if (StringUtil.isNotEmpty(t.getMaterialName())) { + t.setMaterialName(t.getMaterialName().trim()); + } else { + return "设计子表-物料名称不能为空"; + } } + } return countRecover; } + /** - * 新增修改数据(事务回滚) - * @param id - * @param yysMaterialRequirementPlanForm - * @return - */ + * 新增修改数据(事务回滚) + * + * @param id + * @param yysMaterialRequirementPlanForm + * @return + */ @Override @Transactional - public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,String id, boolean isSave) throws Exception{ - UserInfo userInfo=userProvider.get(); + public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, String id, boolean isSave) throws Exception { + UserInfo userInfo = userProvider.get(); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); yysMaterialRequirementPlanForm = JsonUtil.getJsonToBean( - generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(),yysMaterialRequirementPlanForm),YysMaterialRequirementPlanForm.class); + generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(), yysMaterialRequirementPlanForm), YysMaterialRequirementPlanForm.class); YysMaterialRequirementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialRequirementPlanForm, YysMaterialRequirementPlanEntity.class); - if(isSave){ - String mainId = RandomUtil.uuId() ; - entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false)); + if (isSave) { + String mainId = RandomUtil.uuId(); + entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false)); entity.setId(mainId); - }else{ + entity.setCreatorTime(DateUtil.getNowDate()); + entity.setCreatorUserId(userInfo.getUserId()); + } else { + entity.setLastModifyTime(DateUtil.getNowDate()); + entity.setLastModifyUserId(userInfo.getUserId()); // entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false)); } this.saveOrUpdate(entity); //YysMaterialRequirementItem子表数据新增修改 - if(!isSave){ + if (!isSave) { QueryWrapper YysMaterialRequirementItemqueryWrapper = new QueryWrapper<>(); YysMaterialRequirementItemqueryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, entity.getId()); yysMaterialRequirementItemService.remove(YysMaterialRequirementItemqueryWrapper); } - if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList()!=null){ - List tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(),YysMaterialRequirementItemEntity.class); - for(YysMaterialRequirementItemEntity entitys : tableField119){ + if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList() != null) { + List tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(), YysMaterialRequirementItemEntity.class); + for (YysMaterialRequirementItemEntity entitys : tableField119) { entitys.setId(RandomUtil.uuId()); entitys.setMaterialRequirementPlanId(entity.getId()); - if(isSave){ - }else{ + if (isSave) { + entitys.setCreatorTime(DateUtil.getNowDate()); + entitys.setCreatorUserId(userInfo.getUserId()); + } else { } yysMaterialRequirementItemService.saveOrUpdate(entitys); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java index f4e0874..405002f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java @@ -8,23 +8,30 @@ import jnpf.base.ActionResult; import jnpf.base.UserInfo; import jnpf.exception.DataException; import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; import jnpf.service.*; import jnpf.entity.*; import jnpf.util.*; import jnpf.model.yysmaterialrequirementplan.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; + import jnpf.annotation.JnpfField; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.base.entity.ProvinceEntity; + import java.io.IOException; import java.util.stream.Collectors; + import jnpf.engine.entity.FlowTaskEntity; import jnpf.exception.WorkFlowException; import org.springframework.web.multipart.MultipartFile; @@ -36,7 +43,9 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; + import java.io.File; + import jnpf.onlinedev.model.ExcelImFieldModel; import jnpf.onlinedev.model.OnlineImport.ImportDataModel; import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; @@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional; /** * YysMaterialRequirementPlan + * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 @@ -58,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Slf4j @RestController -@Tag(name = "YysMaterialRequirementPlan" , description = "example") +@Tag(name = "YysMaterialRequirementPlan", description = "example") @RequestMapping("/api/example/YysMaterialRequirementPlan") public class YysMaterialRequirementPlanController { @@ -78,28 +88,34 @@ public class YysMaterialRequirementPlanController { @Autowired private ConfigValueUtil configValueUtil; + @Resource + private UserService userService; + /** - * 列表 - * - * @param yysMaterialRequirementPlanPagination - * @return - */ + * 列表 + * + * @param yysMaterialRequirementPlanPagination + * @return + */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination)throws IOException{ - List list= yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) throws IOException { + List list = yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); + List> realList = new ArrayList<>(); for (YysMaterialRequirementPlanEntity entity : list) { - Map yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); - yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); - //副表数据 - //子表数据 - List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(),yysMaterialRequirementPlanPagination); - yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); + Map yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity); + yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); + if (StringUtils.isNoneBlank(yysMaterialRequirementPlanMap.get("creatorUserId").toString())) { + yysMaterialRequirementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialRequirementPlanMap.get("creatorUserId").toString()).getRealName()); + } + //副表数据 + //子表数据 + List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(), yysMaterialRequirementPlanPagination); + yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); realList.add(yysMaterialRequirementPlanMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -108,117 +124,119 @@ public class YysMaterialRequirementPlanController { vo.setPagination(page); return ActionResult.success(vo); } + /** - * 创建 - * - * @param yysMaterialRequirementPlanForm - * @return - */ + * 创建 + * + * @param yysMaterialRequirementPlanForm + * @return + */ @PostMapping() @Operation(summary = "创建") public ActionResult create(@RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm) { - String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm,0); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, null ,true); - }catch(Exception e){ + try { + yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, null, true); + } catch (Exception e) { return ActionResult.fail("新增数据失败"); } return ActionResult.success("创建成功"); } + /** - * 导出Excel - * - * @return - */ + * 导出Excel + * + * @return + */ @Operation(summary = "导出Excel") @PostMapping("/Actions/Export") public ActionResult Export(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) throws IOException { - if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())){ + if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())) { return ActionResult.fail("请选择导出字段"); } - List list= yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); - List> realList=new ArrayList<>(); + List list = yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); + List> realList = new ArrayList<>(); for (YysMaterialRequirementPlanEntity entity : list) { - Map yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); - yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); - //副表数据 - //子表数据 - List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(),yysMaterialRequirementPlanPagination); - yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); + Map yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity); + yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); + //副表数据 + //子表数据 + List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(), yysMaterialRequirementPlanPagination); + yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); realList.add(yysMaterialRequirementPlanMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(),false); - String[]keys=!StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())?yysMaterialRequirementPlanPagination.getSelectKey():new String[0]; - UserInfo userInfo=userProvider.get(); - DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); + realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(), false); + String[] keys = !StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey()) ? yysMaterialRequirementPlanPagination.getSelectKey() : new String[0]; + UserInfo userInfo = userProvider.get(); + DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo); return ActionResult.success(vo); } /** - * 导出表格方法 - */ - public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ - DownloadVO vo=DownloadVO.builder().build(); - List entitys=new ArrayList<>(); - if(keys.length>0){ - ExcelExportEntity tableField119ExcelEntity = new ExcelExportEntity("设计子表","tableField119"); + * 导出表格方法 + */ + public DownloadVO creatModelExcel(String path, List> list, String[] keys, UserInfo userInfo) { + DownloadVO vo = DownloadVO.builder().build(); + List entitys = new ArrayList<>(); + if (keys.length > 0) { + ExcelExportEntity tableField119ExcelEntity = new ExcelExportEntity("设计子表", "tableField119"); List tableField119List = new ArrayList<>(); - for(String key:keys){ - switch(key){ - case "planNumber" : - entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber")); - break; - case "planYearMonth" : - entitys.add(new ExcelExportEntity("年月" ,"planYearMonth")); - break; - case "orderDate" : - entitys.add(new ExcelExportEntity("单据日期" ,"orderDate")); - break; - case "isCreatePlan" : - entitys.add(new ExcelExportEntity("是否生成采购计划" ,"isCreatePlan")); - break; - case "reamrk" : - entitys.add(new ExcelExportEntity("备注" ,"reamrk")); - break; + for (String key : keys) { + switch (key) { + case "planNumber": + entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber")); + break; + case "planYearMonth": + entitys.add(new ExcelExportEntity("年月", "planYearMonth")); + break; + case "orderDate": + entitys.add(new ExcelExportEntity("单据日期", "orderDate")); + break; + case "isCreatePlan": + entitys.add(new ExcelExportEntity("是否生成采购计划", "isCreatePlan")); + break; + case "reamrk": + entitys.add(new ExcelExportEntity("备注", "reamrk")); + break; case "tableField119-materialCode": - tableField119List.add(new ExcelExportEntity("物料编码" ,"materialCode")); - break; + tableField119List.add(new ExcelExportEntity("物料编码", "materialCode")); + break; case "tableField119-materialName": - tableField119List.add(new ExcelExportEntity("物料名称" ,"materialName")); - break; + tableField119List.add(new ExcelExportEntity("物料名称", "materialName")); + break; case "tableField119-materialType": - tableField119List.add(new ExcelExportEntity("物料类型" ,"materialType")); - break; + tableField119List.add(new ExcelExportEntity("物料类型", "materialType")); + break; case "tableField119-specification": - tableField119List.add(new ExcelExportEntity("规格型号" ,"specification")); - break; + tableField119List.add(new ExcelExportEntity("规格型号", "specification")); + break; case "tableField119-unit": - tableField119List.add(new ExcelExportEntity("计量单位" ,"unit")); - break; + tableField119List.add(new ExcelExportEntity("计量单位", "unit")); + break; case "tableField119-requirementNumber": - tableField119List.add(new ExcelExportEntity("需求数量" ,"requirementNumber")); - break; + tableField119List.add(new ExcelExportEntity("需求数量", "requirementNumber")); + break; case "tableField119-inventoryNumber": - tableField119List.add(new ExcelExportEntity("库存" ,"inventoryNumber")); - break; + tableField119List.add(new ExcelExportEntity("库存", "inventoryNumber")); + break; case "tableField119-inventorySafetyNumber": - tableField119List.add(new ExcelExportEntity("库存安全" ,"inventorySafetyNumber")); - break; + tableField119List.add(new ExcelExportEntity("库存安全", "inventorySafetyNumber")); + break; case "tableField119-notIntoNumber": - tableField119List.add(new ExcelExportEntity("采购未入库" ,"notIntoNumber")); - break; + tableField119List.add(new ExcelExportEntity("采购未入库", "notIntoNumber")); + break; case "tableField119-lackNumber": - tableField119List.add(new ExcelExportEntity("欠缺量" ,"lackNumber")); - break; + tableField119List.add(new ExcelExportEntity("欠缺量", "lackNumber")); + break; default: - break; + break; } } - if(tableField119List.size() > 0){ + if (tableField119List.size() > 0) { tableField119ExcelEntity.setList(tableField119List); entitys.add(tableField119ExcelEntity); } @@ -226,10 +244,10 @@ public class YysMaterialRequirementPlanController { ExportParams exportParams = new ExportParams(null, "表单信息"); exportParams.setType(ExcelType.XSSF); - try{ + try { @Cleanup Workbook workbook = new HSSFWorkbook(); - if (entitys.size()>0){ - if (list.size()==0){ + if (entitys.size() > 0) { + if (list.size() == 0) { list.add(new HashMap<>()); } //去除空数据 @@ -239,8 +257,8 @@ public class YysMaterialRequirementPlanController { for (String key : keys) { //子表 if (key.toLowerCase().startsWith("tablefield")) { - String tableField = key.substring(0, key.indexOf("-" )); - String field = key.substring(key.indexOf("-" ) + 1); + String tableField = key.substring(0, key.indexOf("-")); + String field = key.substring(key.indexOf("-") + 1); Object o = map.get(tableField); if (o != null) { List> childList = (List>) o; @@ -266,7 +284,7 @@ public class YysMaterialRequirementPlanController { List complexHeaderList = columnDataModel.getComplexHeaderList(); if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); - dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); + dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); } workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList); @@ -283,94 +301,102 @@ public class YysMaterialRequirementPlanController { } return vo; } + /** - * 编辑 - * @param id - * @param yysMaterialRequirementPlanForm - * @return - */ + * 编辑 + * + * @param id + * @param yysMaterialRequirementPlanForm + * @return + */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, - @RequestParam(value = "isImport", required = false) boolean isImport){ + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { yysMaterialRequirementPlanForm.setId(id); if (!isImport) { - String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm,1); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } } - YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); - if(entity!=null){ - try{ - yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm,id,false); - }catch(Exception e){ + YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id); + if (entity != null) { + try { + yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, id, false); + } catch (Exception e) { return ActionResult.fail("修改数据失败"); } return ActionResult.success("更新成功"); - }else{ + } else { return ActionResult.fail("更新失败，数据不存在"); } } + /** - * 删除 - * @param id - * @return - */ + * 删除 + * + * @param id + * @return + */ @Operation(summary = "删除") @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id); + if (entity != null) { //假删除 entity.setDeleteMark(1); - yysMaterialRequirementPlanService.update(id,entity); + yysMaterialRequirementPlanService.update(id, entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); + Map yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); //副表数据 //子表数据 List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId()); - yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); - yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialRequirementPlanMap,YysMaterialRequirementPlanConstant.getFormData(),"590812661621456901",false); + yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); + yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialRequirementPlanMap, YysMaterialRequirementPlanConstant.getFormData(), "590812661621456901", false); return ActionResult.success(yysMaterialRequirementPlanMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); + Map yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); //副表数据 //子表数据 List yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId()); - yysMaterialRequirementPlanMap.put("yysMaterialRequirementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); - yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialRequirementPlanMap,YysMaterialRequirementPlanConstant.getFormData(),YysMaterialRequirementPlanConstant.TABLEFIELDKEY,YysMaterialRequirementPlanConstant.TABLERENAMES); + yysMaterialRequirementPlanMap.put("yysMaterialRequirementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); + yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialRequirementPlanMap, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.TABLEFIELDKEY, YysMaterialRequirementPlanConstant.TABLERENAMES); return ActionResult.success(yysMaterialRequirementPlanMap); } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue index 1b51349..facff13 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue @@ -82,7 +82,7 @@ - + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue index d8103cd..aa8aaf2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue @@ -68,9 +68,15 @@ + + - + + + + +