From ce1a4df30e16ff4873bae9fb5ac02b7733b50feb Mon Sep 17 00:00:00 2001 From: jiyufei <67400194@qq.com> Date: Thu, 8 Aug 2024 13:39:11 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E5=96=84;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...YysMaterialProcurementPlanServiceImpl.java | 372 ++--- .../controller/YysDeviceUpkeepController.java | 8 +- .../YysMaterialProcurementPlanController.java | 306 ++-- .../src/views/yys/yysdayplan/index.vue | 2 + .../src/views/yys/yysdeviceupkeep/Detail.vue | 466 +++---- .../yys/yysmaterialprocurementplan/Detail.vue | 339 ++--- .../yys/yysmaterialprocurementplan/form.vue | 1125 +++++++-------- .../yys/yysmaterialprocurementplan/index.vue | 812 ++++++----- .../yys/yysmaterialrequirementplan/Detail.vue | 359 +++-- .../yys/yysmaterialrequirementplan/form.vue | 1226 ++++++++--------- .../yys/yysmaterialrequirementplan/index.vue | 23 +- 11 files changed, 2570 insertions(+), 2468 deletions(-) diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java index 1de44ec..d71c2d2 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java @@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialProcurementPlanMapper; import jnpf.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.model.yysmaterialprocurementplan.*; + 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; + /** - * * YysMaterialProcurementPlan * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） @@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity; * 日期： 2024-08-08 */ @Service -public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl implements YysMaterialProcurementPlanService{ +public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl implements YysMaterialProcurementPlanService { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -48,341 +60,363 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ - return getTypeList(yysMaterialProcurementPlanPagination,yysMaterialProcurementPlanPagination.getDataType()); + public List getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) { + return getTypeList(yysMaterialProcurementPlanPagination, yysMaterialProcurementPlanPagination.getDataType()); } - /** 列表查询 */ + + /** + * 列表查询 + */ @Override - public List getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - List> intersectionList =new ArrayList<>(); + public List getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination, 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 ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData(); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); - int total=0; - int yysMaterialProcurementPlanNum =0; - QueryWrapper yysMaterialProcurementPlanQueryWrapper=new QueryWrapper<>(); - int yysMaterialProcurementItemNum =0; - QueryWrapper yysMaterialProcurementItemQueryWrapper=new QueryWrapper<>(); + int total = 0; + int yysMaterialProcurementPlanNum = 0; + QueryWrapper yysMaterialProcurementPlanQueryWrapper = new QueryWrapper<>(); + int yysMaterialProcurementItemNum = 0; + QueryWrapper yysMaterialProcurementItemQueryWrapper = new QueryWrapper<>(); long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count(); List allSuperIDlist = new ArrayList<>(); - String superOp =""; - if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())){ + String superOp = ""; + if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())) { List allSuperList = new ArrayList<>(); - List> intersectionSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson(); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); int superNum = 0; QueryWrapper yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); - yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,queryJson,"0")); + yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, queryJson, "0")); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size(); - if (yysMaterialProcurementPlanNum1>0){ - List yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); + if (yysMaterialProcurementPlanNum1 > 0) { + List yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); allSuperList.addAll(yysMaterialProcurementPlanList); intersectionSuperList.add(yysMaterialProcurementPlanList); superNum++; } String YysMaterialProcurementItemTable = "yys_material_procurement_item"; boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable); - List yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , queryJson, null); - if (YysMaterialProcurementItemHasSql){ + List yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, queryJson, null); + if (YysMaterialProcurementItemHasSql) { allSuperList.addAll(yysMaterialProcurementItemList); intersectionSuperList.add(yysMaterialProcurementItemList); 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 yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); - yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,ruleJson,"0")); + yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, ruleJson, "0")); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size(); - if (yysMaterialProcurementPlanNum1>0){ - List yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); + if (yysMaterialProcurementPlanNum1 > 0) { + List yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); allRuleList.addAll(yysMaterialProcurementPlanList); intersectionRuleList.add(yysMaterialProcurementPlanList); ruleNum++; } String YysMaterialProcurementItemTable = "yys_material_procurement_item"; boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable); - List yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , ruleJson, null); - if (YysMaterialProcurementItemHasSql){ + List yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, ruleJson, null); + if (YysMaterialProcurementItemHasSql) { allRuleList.addAll(yysMaterialProcurementItemList); intersectionRuleList.add(yysMaterialProcurementItemList); 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 yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){ - return new ArrayList<>(); - } else { - yysMaterialProcurementPlanQueryWrapper = (QueryWrapper)yysMaterialProcurementPlanObj; - if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialProcurementPlanNum++; - } - } - Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ - return new ArrayList<>(); - } else { - yysMaterialProcurementItemQueryWrapper = (QueryWrapper)yysMaterialProcurementItemObj; - if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialProcurementItemNum++; - } - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){ - return new ArrayList<>(); - } else { - yysMaterialProcurementPlanQueryWrapper = (QueryWrapper)yysMaterialProcurementPlanObj; - if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialProcurementPlanNum++; - } + boolean pcPermission = true; + boolean appPermission = false; + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) { + return new ArrayList<>(); + } else { + yysMaterialProcurementPlanQueryWrapper = (QueryWrapper) yysMaterialProcurementPlanObj; + if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialProcurementPlanNum++; + } + } + Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) { + return new ArrayList<>(); + } else { + yysMaterialProcurementItemQueryWrapper = (QueryWrapper) yysMaterialProcurementItemObj; + if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialProcurementItemNum++; + } + } + } } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) { + return new ArrayList<>(); + } else { + yysMaterialProcurementPlanQueryWrapper = (QueryWrapper) yysMaterialProcurementPlanObj; + if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialProcurementPlanNum++; + } + } - Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); - if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ - return new ArrayList<>(); - } else { - yysMaterialProcurementItemQueryWrapper = (QueryWrapper)yysMaterialProcurementItemObj; - if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ - yysMaterialProcurementItemNum++; - } - } + Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) { + return new ArrayList<>(); + } else { + yysMaterialProcurementItemQueryWrapper = (QueryWrapper) yysMaterialProcurementItemObj; + if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) { + yysMaterialProcurementItemNum++; + } + } - } - } - if(isPc){ - if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())){ - yysMaterialProcurementPlanNum++; + } + } + if (isPc) { + if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())) { + yysMaterialProcurementPlanNum++; String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ? - JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) : - String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber()); - yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber,value); + JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) : + String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber()); + yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber, value); } - if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())){ - yysMaterialProcurementPlanNum++; + if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())) { + yysMaterialProcurementPlanNum++; - List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(),String.class); - Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0))); - Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1))); + List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(), String.class); + Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0))); + Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1))); - yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir)) - .le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir)) + .le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())){ - yysMaterialProcurementPlanNum++; + if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())) { + yysMaterialProcurementPlanNum++; - List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(),String.class); - Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0))); - Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1))); + List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(), String.class); + Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0))); + Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1))); - yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir)) - .le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir)) + .le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } } - if(yysMaterialProcurementItemNum>0){ - List yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t->t.getMaterialProcurementPlanId()).collect(Collectors.toList()); + if (yysMaterialProcurementItemNum > 0) { + List yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t -> t.getMaterialProcurementPlanId()).collect(Collectors.toList()); long count = yysMaterialProcurementItemService.count(); - if (count>0){ - intersectionList.add(yysMaterialProcurementItemIdList); + if (count > 0) { + intersectionList.add(yysMaterialProcurementItemIdList); } AllIdList.addAll(yysMaterialProcurementItemIdList); - } - total+=yysMaterialProcurementItemNum; + } + total += yysMaterialProcurementItemNum; List intersection = generaterSwapUtil.getIntersection(intersectionList); - if (total>0){ - if (intersection.size()==0){ + if (total > 0) { + if (intersection.size() == 0) { intersection.add("jnpfNullList"); } yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection); } - //是否有高级查询 - if (StringUtil.isNotEmpty(superOp)){ - if (allSuperIDlist.size()==0){ + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { allSuperIDlist.add("jnpfNullList"); } List finalAllSuperIDlist = allSuperIDlist; - yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist)); + yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist)); } - //是否有数据过滤查询 - if (StringUtil.isNotEmpty(ruleOp)){ - if (allRuleIDlist.size()==0){ + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { allRuleIDlist.add("jnpfNullList"); } List finalAllRuleIDlist = allRuleIDlist; - yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist)); + yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist)); } //假删除标志 yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark); //排序 - if(StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())){ + if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())) { yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate); - }else{ + } else { try { String sidx = yysMaterialProcurementPlanPagination.getSidx(); - String[] strs= sidx.split("_name"); + String[] strs = sidx.split("_name"); YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity(); Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]); declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value(); - yysMaterialProcurementPlanQueryWrapper="asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase())?yysMaterialProcurementPlanQueryWrapper.orderByAsc(value):yysMaterialProcurementPlanQueryWrapper.orderByDesc(value); + yysMaterialProcurementPlanQueryWrapper = "asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase()) ? yysMaterialProcurementPlanQueryWrapper.orderByAsc(value) : yysMaterialProcurementPlanQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize()); - IPage userIPage=this.page(page, yysMaterialProcurementPlanQueryWrapper); - return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize()); + IPage userIPage = this.page(page, yysMaterialProcurementPlanQueryWrapper); + return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return yysMaterialProcurementPlanPagination.setData(list, list.size()); } - }else{ + } else { return this.list(yysMaterialProcurementPlanQueryWrapper); } } + @Override - public YysMaterialProcurementPlanEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId,id); + public YysMaterialProcurementPlanEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId, id); return this.getOne(queryWrapper); } + @Override - public void create(YysMaterialProcurementPlanEntity entity){ + public void create(YysMaterialProcurementPlanEntity entity) { this.save(entity); } + @Override - public boolean update(String id, YysMaterialProcurementPlanEntity entity){ + public boolean update(String id, YysMaterialProcurementPlanEntity entity) { return this.updateById(entity); } + @Override - public void delete(YysMaterialProcurementPlanEntity entity){ - if(entity!=null){ + public void delete(YysMaterialProcurementPlanEntity entity) { + if (entity != null) { this.removeById(entity.getId()); } } - /** YysMaterialProcurementItem子表方法 */ + + /** + * YysMaterialProcurementItem子表方法 + */ @Override - public List getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ - Map newtabMap=YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet() - .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); - String tableName="yysMaterialProcurementItem"; - tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); + public List getYysMaterialProcurementItemList(String id, YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) { + Map newtabMap = YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet() + .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey())); + String tableName = "yysMaterialProcurementItem"; + tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination,queryWrapper); + queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination, queryWrapper); queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); - generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialProcurementItemEntity.class,"sub",tableName); + generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper, YysMaterialProcurementItemEntity.class, "sub", tableName); return yysMaterialProcurementItemService.list(queryWrapper); } - /** YysMaterialProcurementItem子表方法 */ + /** + * YysMaterialProcurementItem子表方法 + */ @Override - public List getYysMaterialProcurementItemList(String id){ + public List getYysMaterialProcurementItemList(String id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); return yysMaterialProcurementItemService.list(queryWrapper); } - /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + + /** + * 验证表单唯一字段，正则，非空 i-0新增-1修改 + */ @Override - public String checkForm(YysMaterialProcurementPlanForm form,int i) { - boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); - String id=""; + public String checkForm(YysMaterialProcurementPlanForm 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.getYysMaterialProcurementItemList()!=null){ - } + if (form.getYysMaterialProcurementItemList() != null) { + } return countRecover; } + /** - * 新增修改数据(事务回滚) - * @param id - * @param yysMaterialProcurementPlanForm - * @return - */ + * 新增修改数据(事务回滚) + * + * @param id + * @param yysMaterialProcurementPlanForm + * @return + */ @Override @Transactional - public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception{ - UserInfo userInfo=userProvider.get(); + public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, String id, boolean isSave) throws Exception { + UserInfo userInfo = userProvider.get(); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean( - generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(),yysMaterialProcurementPlanForm),YysMaterialProcurementPlanForm.class); + generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(), yysMaterialProcurementPlanForm), YysMaterialProcurementPlanForm.class); YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class); - if(isSave){ - String mainId = RandomUtil.uuId() ; - entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); + if (isSave) { + String mainId = RandomUtil.uuId(); + entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); entity.setId(mainId); - }else{ - //entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); + } else { + //entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); } this.saveOrUpdate(entity); //YysMaterialProcurementItem子表数据新增修改 - if(!isSave){ + if (!isSave) { QueryWrapper YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>(); YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId()); yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper); } - if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList()!=null){ - List tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(),YysMaterialProcurementItemEntity.class); - for(YysMaterialProcurementItemEntity entitys : tableField107){ + if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList() != null) { + List tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(), YysMaterialProcurementItemEntity.class); + for (YysMaterialProcurementItemEntity entitys : tableField107) { entitys.setId(RandomUtil.uuId()); entitys.setMaterialProcurementPlanId(entity.getId()); - if(isSave){ - }else{ + if (isSave) { + } else { } yysMaterialProcurementItemService.saveOrUpdate(entitys); } + //每次修改的时候去修改下 采购表的修改时间和创建用户 其次统计数量 + entity.setLastModifyTime(DateUtil.getNowDate()); + entity.setLastModifyUserId(userInfo.getUserId()); + this.saveOrUpdate(entity); } } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java index d3a43eb..de0de24 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java @@ -183,6 +183,10 @@ public class YysDeviceUpkeepController { } Map yysDeviceUpkeepMap = JsonUtil.entityToMap(entity); yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id")); + yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName()); + if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){ + yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName()); + } //副表数据 //子表数据 List yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId()); @@ -208,7 +212,9 @@ public class YysDeviceUpkeepController { Map yysDeviceUpkeepMap = JsonUtil.entityToMap(entity); yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id")); yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName()); - yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName()); + if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){ + yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName()); + } //副表数据 //子表数据 List yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId()); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java index 8d32c95..594a068 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.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.yysmaterialprocurementplan.*; 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; /** * YysMaterialProcurementPlan + * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 @@ -58,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Slf4j @RestController -@Tag(name = "YysMaterialProcurementPlan" , description = "example") +@Tag(name = "YysMaterialProcurementPlan", description = "example") @RequestMapping("/api/example/YysMaterialProcurementPlan") public class YysMaterialProcurementPlanController { @@ -78,28 +88,34 @@ public class YysMaterialProcurementPlanController { @Autowired private ConfigValueUtil configValueUtil; + @Resource + private UserService userService; + /** - * 列表 - * - * @param yysMaterialProcurementPlanPagination - * @return - */ + * 列表 + * + * @param yysMaterialProcurementPlanPagination + * @return + */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination)throws IOException{ - List list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException { + List list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); + List> realList = new ArrayList<>(); for (YysMaterialProcurementPlanEntity entity : list) { - Map yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); - yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); - //副表数据 - //子表数据 - List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination); - yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); + Map yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity); + yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); + if (StringUtils.isNoneBlank(yysMaterialProcurementPlanMap.get("creatorUserId").toString())) { + yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName()); + } + //副表数据 + //子表数据 + List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination); + yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); realList.add(yysMaterialProcurementPlanMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -108,108 +124,110 @@ public class YysMaterialProcurementPlanController { vo.setPagination(page); return ActionResult.success(vo); } + /** - * 创建 - * - * @param yysMaterialProcurementPlanForm - * @return - */ + * 创建 + * + * @param yysMaterialProcurementPlanForm + * @return + */ @PostMapping() @Operation(summary = "创建") public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) { - String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,0); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null ,true); - }catch(Exception e){ + try { + yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, 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 YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException { - if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())){ + if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())) { return ActionResult.fail("请选择导出字段"); } - List list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); - List> realList=new ArrayList<>(); + List list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); + List> realList = new ArrayList<>(); for (YysMaterialProcurementPlanEntity entity : list) { - Map yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); - yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); - //副表数据 - //子表数据 - List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination); - yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); + Map yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity); + yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); + //副表数据 + //子表数据 + List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination); + yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); realList.add(yysMaterialProcurementPlanMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false); - String[]keys=!StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())?yysMaterialProcurementPlanPagination.getSelectKey():new String[0]; - UserInfo userInfo=userProvider.get(); - DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); + realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false); + String[] keys = !StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey()) ? yysMaterialProcurementPlanPagination.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 tableField107ExcelEntity = new ExcelExportEntity("物料明细","tableField107"); + * 导出表格方法 + */ + 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 tableField107ExcelEntity = new ExcelExportEntity("物料明细", "tableField107"); List tableField107List = new ArrayList<>(); - for(String key:keys){ - switch(key){ - case "procurementNumber" : - entitys.add(new ExcelExportEntity("采购计划单号" ,"procurementNumber")); - break; - case "procurementDate" : - entitys.add(new ExcelExportEntity("单据日期" ,"procurementDate")); - break; - case "procurementYearMonth" : - entitys.add(new ExcelExportEntity("年月" ,"procurementYearMonth")); - break; - case "planNumber" : - entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber")); - break; - case "reamrk" : - entitys.add(new ExcelExportEntity("备注" ,"reamrk")); - break; + for (String key : keys) { + switch (key) { + case "procurementNumber": + entitys.add(new ExcelExportEntity("采购计划单号", "procurementNumber")); + break; + case "procurementDate": + entitys.add(new ExcelExportEntity("单据日期", "procurementDate")); + break; + case "procurementYearMonth": + entitys.add(new ExcelExportEntity("年月", "procurementYearMonth")); + break; + case "planNumber": + entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber")); + break; + case "reamrk": + entitys.add(new ExcelExportEntity("备注", "reamrk")); + break; case "tableField107-materialCode": - tableField107List.add(new ExcelExportEntity("物料编码" ,"materialCode")); - break; + tableField107List.add(new ExcelExportEntity("物料编码", "materialCode")); + break; case "tableField107-materialName": - tableField107List.add(new ExcelExportEntity("物料名称" ,"materialName")); - break; + tableField107List.add(new ExcelExportEntity("物料名称", "materialName")); + break; case "tableField107-materialType": - tableField107List.add(new ExcelExportEntity("物料类型" ,"materialType")); - break; + tableField107List.add(new ExcelExportEntity("物料类型", "materialType")); + break; case "tableField107-specification": - tableField107List.add(new ExcelExportEntity("规格型号" ,"specification")); - break; + tableField107List.add(new ExcelExportEntity("规格型号", "specification")); + break; case "tableField107-lackNumber": - tableField107List.add(new ExcelExportEntity("欠缺量" ,"lackNumber")); - break; + tableField107List.add(new ExcelExportEntity("欠缺量", "lackNumber")); + break; case "tableField107-procurementPlanNumber": - tableField107List.add(new ExcelExportEntity("拟采购量" ,"procurementPlanNumber")); - break; + tableField107List.add(new ExcelExportEntity("拟采购量", "procurementPlanNumber")); + break; case "tableField107-unit": - tableField107List.add(new ExcelExportEntity("计量单位" ,"unit")); - break; + tableField107List.add(new ExcelExportEntity("计量单位", "unit")); + break; default: - break; + break; } } - if(tableField107List.size() > 0){ + if (tableField107List.size() > 0) { tableField107ExcelEntity.setList(tableField107List); entitys.add(tableField107ExcelEntity); } @@ -217,10 +235,10 @@ public class YysMaterialProcurementPlanController { 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<>()); } //去除空数据 @@ -230,8 +248,8 @@ public class YysMaterialProcurementPlanController { 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; @@ -257,7 +275,7 @@ public class YysMaterialProcurementPlanController { 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); @@ -274,94 +292,110 @@ public class YysMaterialProcurementPlanController { } return vo; } + /** - * 编辑 - * @param id - * @param yysMaterialProcurementPlanForm - * @return - */ + * 编辑 + * + * @param id + * @param yysMaterialProcurementPlanForm + * @return + */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, - @RequestParam(value = "isImport", required = false) boolean isImport){ + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { yysMaterialProcurementPlanForm.setId(id); if (!isImport) { - String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,1); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } } - YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); - if(entity!=null){ - try{ - yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm,id,false); - }catch(Exception e){ + YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id); + if (entity != null) { + try { + yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, 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){ - YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id); + if (entity != null) { //假删除 entity.setDeleteMark(1); - yysMaterialProcurementPlanService.update(id,entity); + yysMaterialProcurementPlanService.update(id, entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); + Map yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); + yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName()); + if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) { + yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName()); + } //副表数据 //子表数据 List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId()); - yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); - yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),"590930391657874309",false); + yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); + yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), "590930391657874309", false); return ActionResult.success(yysMaterialProcurementPlanMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); + Map yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); + yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName()); + if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) { + yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName()); + } //副表数据 //子表数据 List yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId()); - yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); - yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),YysMaterialProcurementPlanConstant.TABLEFIELDKEY,YysMaterialProcurementPlanConstant.TABLERENAMES); + yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); + yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.TABLEFIELDKEY, YysMaterialProcurementPlanConstant.TABLERENAMES); return ActionResult.success(yysMaterialProcurementPlanMap); } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue index f6bcee2..327ce1d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue @@ -51,6 +51,8 @@
+
+
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue index 8b70118..e0388d5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue @@ -1,260 +1,242 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue index c1a7015..665bcd7 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue @@ -1,177 +1,198 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue index 50cc0fe..dc5785b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue @@ -1,200 +1,241 @@ +