From fdbd2a3336f5f3d5a38ca33bdca7b768ec8cb328 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 28 Mar 2023 18:18:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 69 +++++++++---------- .../controller/AskQuestionsController.java | 7 ++ .../impl/SarBussionessStandServiceImpl.java | 39 ++++------- 3 files changed, 51 insertions(+), 64 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 05ae71e6..1f250cad 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -193,13 +193,6 @@ public class ActSarItemsEOService { String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); - QueryWrapper wrapper=new QueryWrapper<>(); - wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()) - .eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()); - Integer s=sarStandardsInfoEOService.count(wrapper); - if (s>0){ - throw new AdcDaBaseException("当前标准编号和中文名称已存在"); - } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId String standnumber = ""; @@ -254,37 +247,37 @@ public class ActSarItemsEOService { sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",relatePro); String content = "新增一条相关流程:" +prcName+" "+prcNum; sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),standType+"_STAND",content); - }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况 - String standId = standlist.get(0).getId(); - SarStandardsInfo query = new SarStandardsInfo(); - query.setId(standId); - sarStandardsInfoEOService.attrInfoDetails(query); - Map attrInfoMap = query.getAttrInfoMap(); - if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); - resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); - sarStandardsInfoEO.setSarStandAttrEOStr(resData); - } - // 查询原相关流程 - String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId); - if (StringUtils.isNotBlank(relatePro)) { - String[] processSplit = relatePro.split(","); - Set processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } - // 编辑标准 - sarStandardsInfoEO.setId(standId); - sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); - // 编辑相关流程 - sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); +// }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况 +// String standId = standlist.get(0).getId(); +// SarStandardsInfo query = new SarStandardsInfo(); +// query.setId(standId); +// sarStandardsInfoEOService.attrInfoDetails(query); +// Map attrInfoMap = query.getAttrInfoMap(); +// if(attInfoMap!=null && !attInfoMap.isEmpty()){ +// updateStandFileFieldData(attInfoMap,attrInfoMap); +// resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); +// sarStandardsInfoEO.setSarStandAttrEOStr(resData); +// } +// // 查询原相关流程 +// String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// } else { +// relatePro = prcNum; +// } +// // 编辑标准 +// sarStandardsInfoEO.setId(standId); +// sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); +// // 编辑相关流程 +// sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro); +// String content = "新增一条相关流程:" +prcName+" "+prcNum; +// sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); } else {//标准号、ID都不存在的情况 // 新增方法 sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 9dd5b33f..de6da2a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.StandardQA.entity.*; import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl; +import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.util.http.ResponseMessage; @@ -16,6 +17,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,6 +44,9 @@ public class AskQuestionsController extends BaseController { @Autowired private SubscriptionServiceImpl subscriptionService; + private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoServiceImpl.class); + + @GetMapping("/getAskQuestionsPage") public ResponseMessage> getAskQuestionsPage(AskQuestionsPage askQuestions){ IPage iPage = new Page<>(); @@ -175,6 +181,7 @@ public class AskQuestionsController extends BaseController { List askUserListUser = new ArrayList<>(); for (AskUser user: askUserList){ askUserListUser.add(user.getUsid()); + logger.info("问答中心分配人员"+user.getUsid()+"===="+user.getAsdId()+"总人数："+askUserList.size()); } JSONArray jsonArray = JSONArray.fromObject(askUserListUser); objectObjectHashMap.put("questioner",jsonArray); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 34201c5e..3bb0dfd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -69,7 +69,9 @@ import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.dao.UserEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.sys.util.LoginUserUtil; @@ -246,6 +248,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attrInfoMap = query.getAttrInfoMap(); - if(attInfoMap!=null && !attInfoMap.isEmpty()){ -// updateStandFileFieldData(attInfoMap,attrInfoMap); - resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); - sarBussionessStand.setSarStandAttrEOStr(resData); - } - - // 编辑标准 - sarBussionessStand.setId(standId); - iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setStandCode(standCode); @@ -3868,12 +3853,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 19:51:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 19 +- .../SarBussionessStandController.java | 4 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 258 ++++++++++++++++-- .../service/ITsResourceService.java | 3 + .../service/impl/TsResourceServiceImpl.java | 9 + .../java/com/adc/da/sys/dao/DicTypeEODao.java | 3 + .../mybatis/mapper/sys/DicTypeEOMapper.xml | 17 ++ 8 files changed, 283 insertions(+), 32 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 321d8870..e873891a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -84,9 +84,24 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String xgjh; - //附件 + //发布稿附件 + private String fbgbuss; + + //编制说明附件 + private String bzsmbuss; + + //历史版本附件 + private String lsbbbuss; + + //其他文件附件 private String qtwjbuss; + //修改单附件 + private String xgd; + + //关联文件附件 + private String glwjbuss; + //标准中文名称 private String standName; @@ -109,7 +124,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String issueTime; //标准编号 - private String standCode; + private String standNumber; //标准英文名称 private String standEnName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 0a0075bd..5ff436e6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -416,9 +416,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ + public ResponseMessage importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId) throws Exception{ - return sarBussionessStandEOService.importSarBussionessStandFile(file); + return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 0e072d8e..a151748b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage emptyFileAnewStorage(String type); - ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; + ResponseMessage importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception; ResponseMessage repetitionFile(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 3bb0dfd3..bf8fbf42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -248,6 +248,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl dicTypeEOS = dicTypeEODao.selectByPidInfo(pid); List sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id); SarBussionessStand sarBussionessStandEO = new SarBussionessStand(); if(!sarBussionessStandlist.isEmpty()) { List newStandList = new ArrayList<>(); newStandList.add(sarBussionessStandlist.get(0)); attrInfoShowDetails(newStandList); + for (DicTypeEO data : dicTypeEOS){ + if(data.getDicTypeCode().equals(newStandList.get(0).getTextStatusBuss())){ + newStandList.get(0).setTextStatusBussShow(data.getDicTypeName()); + } + } sarBussionessStandEO = newStandList.get(0); } + //企标文本状态 return sarBussionessStandEO; } @@ -2022,9 +2033,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file)throws Exception { + public ResponseMessage importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception { + + List tsResources = tsResourceService.getByMenuId(menuId); + if (ObjectUtils.isEmpty(tsResources)){ + return Result.error("请选择目录进行导入"); + } + + //给出头部信息 - String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; + String[] headerExcel = {"企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"}; //获取文件全称 String fileNameStr = file.getOriginalFilename(); @@ -2118,8 +2136,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100){ + return Result.error("企标类别输入过长"); + } + sarBussStandAttrInfo.setStandSort(standSort); + }else { + return Result.error("企标类别不能为空"); + } + + String standYear = rowList.get("标准年份"); + if (StringUtils.isNotBlank(standYear)){ + if (standYear.length() > 100){ + return Result.error("标准年份输入过长"); + } + sarBussStandAttrInfo.setStandYear(standYear); + }else { + return Result.error("标准年份不能为空"); + } + + String standNumber = rowList.get("企标编号"); + sarBussStandAttrInfo.setStandNumber(standNumber); String standName = rowList.get("中文名称"); if(StringUtils.isNotBlank(standName)){ @@ -2127,6 +2165,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 200){ return Result.error("输入的文本状态过长"); } - sarBussStandAttrInfo.setTextStatusBuss(textStatusBuss); + + switch (textStatusBuss){ + case "发布": + sarBussStandAttrInfo.setTextStatusBuss("6jnqba2mby"); + break; + case "被代替": + sarBussStandAttrInfo.setTextStatusBuss("quxujsuev5"); + break; + case "参考": + sarBussStandAttrInfo.setTextStatusBuss("01i8opy07d"); + break; + case "即将实施": + sarBussStandAttrInfo.setTextStatusBuss("rpvoxsvr60"); + break; + case "有效": + sarBussStandAttrInfo.setTextStatusBuss("9z741h2m3j"); + break; + case "直接上传": + sarBussStandAttrInfo.setTextStatusBuss("t769k1rkcy"); + break; + case "作废": + sarBussStandAttrInfo.setTextStatusBuss("3lqnlgmgcn"); + break; + case "待修订-指的其他企业标准": + sarBussStandAttrInfo.setTextStatusBuss("1w7cegukbs"); + break; + default: + return Result.error("请提供准确的文本状态"); + } + }else { + return Result.error("文本状态不能为空"); } SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd"); @@ -2246,7 +2316,68 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100){ - return Result.error("企标类型输入过长"); + String xgd = rowList.get("修改单附件"); + if (xgd != null && !xgd.equals("")) { + String[] split = xgd.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } + sarBussStandAttrInfo.setXgd(s); } - sarBussStandAttrInfo.setStandSort(standSort); } - String standYear = rowList.get("标准年份"); - if (StringUtils.isNotBlank(standYear)){ - if (standYear.length() > 100){ - return Result.error("标准年份输入过长"); + String glwjbuss = rowList.get("关联文件附件"); + if (glwjbuss != null && !glwjbuss.equals("")) { + String[] split = glwjbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } + sarBussStandAttrInfo.setGlwjbuss(s); } - sarBussStandAttrInfo.setStandYear(standYear); } List list = new ArrayList<>(); @@ -2368,6 +2523,12 @@ public class SarBussionessStandServiceImpl extends ServiceImplqueryWrapper = new QueryWrapper<>(); @@ -2378,13 +2539,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); - //此处判断是否是带入的标准 if(StringUtils.isNotBlank(sarBussionessStand.getId())) { bussId = sarBussionessStand.getId(); @@ -2401,8 +2555,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); Map dicMap = dicInfo.stream() - .filter(item-> !item.getDicTypeName().isEmpty()) - .collect(Collectors.toMap(DicTypeEO::getDicTypeName,DicTypeEO::getDicTypeCode,(value1, value2 )->value2)); + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); for(SarBussStandAttrInfoExecl row : sarlist){ attrInfoDetailsImport(row); @@ -3951,4 +4105,54 @@ public class SarBussionessStandServiceImpl extends ServiceImpl saveSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception { + //标准信息表中插入一条数据 + sarBussionessStandEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarBussionessStandEO.setCreationTime(new Date()); + sarBussionessStandEO.setModifyTime(new Date()); + sarBussionessStandEO.setId(UUIDUtils.randomUUID20()); + + if (StringUtils.isEmpty(sarBussionessStandEO.getMenuId())){ + sarBussionessStandEO.setMenuId("3"); + } + //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据 + if (StringUtils.isNotEmpty(sarBussionessStandEO.getMenuId())) { + SarBussStandMenu sarStandMenuEO = new SarBussStandMenu(); + sarStandMenuEO.setBussStandId(sarBussionessStandEO.getId()); + sarStandMenuEO.setMenuId(sarBussionessStandEO.getMenuId()); + sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + int insertresult = this.baseMapper.insert(sarBussionessStandEO); + if (insertresult >= 1) { + // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号 + updateReplaceConnect(sarBussionessStandEO); + //编写预警信息 +// writeWarnings(sarBussionessStandEO); + // 处理属性表信息 + if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) { + createStandAttrInfo(sarBussionessStandEO,false); + } + // 增加关联事件 + String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort(),"JKSADFH564S"); + String number = sortName + " " + sarBussionessStandEO.getStandCode(); + if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) { + number += "-" + sarBussionessStandEO.getStandYear(); + } + String content = "入库" + number + " 《" + sarBussionessStandEO.getStandName() + "》"; + String prcCreateUser = StringUtils.isNotBlank(sarBussionessStandEO.getPrcCreateUser()) ? sarBussionessStandEO.getPrcCreateUser() : ""; + sarUpdLogEOService.createBaseProcessLog(sarBussionessStandEO.getId(),"BUSINESS",content,prcCreateUser); + saveNewFeed(sarBussionessStandEO,"2"); + if(elasflag) { + attrInfoShowSearchDetails(sarBussionessStandEO,"add"); + createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add"); + } + return Result.success("00", "插入数据成功", sarBussionessStandEO); + } else { + return Result.error("01", "插入输入过程中出错"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 13c08cd7..3eadc5af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -59,4 +59,7 @@ public interface ITsResourceService extends IService { List getChildMenuList(String menuId); boolean dealWithData(); + + List getByMenuId(String menuId)throws Exception; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 0815fd38..418fd126 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarResource.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -490,6 +491,14 @@ public class TsResourceServiceImpl extends ServiceImpl getByMenuId(String menuId) throws Exception{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PARENT_ID",menuId); + List tsResources = baseMapper.selectList(queryWrapper); + return tsResources; + } + public boolean dealData(TsResource tsResource,Map map){ if (null!=tsResource.getParentId() && !"".equals(tsResource.getParentId()) && !"0".equals(tsResource.getParentId())){ tsResource.setParentIds(tsResource.getParentIds()+tsResource.getParentId()+","); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index 18d9e1ac..ff865a8a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -85,4 +85,7 @@ public interface DicTypeEODao extends BaseMapper { */ public List getDicInfo(@Param("filed") String... filed); + String selectByPid(@Param("Info") String Info); + + List selectByPidInfo(@Param("pid") String pid); } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 2bcc302c..25d4c58b 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -614,4 +614,21 @@ + + + From fd2d8bbc57de21b5ce90d510c6f0b75d80ce982f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 30 Mar 2023 15:36:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B=E5=92=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 3 + .../SarBussionessStandController.java | 71 +- .../impl/SarBussionessStandServiceImpl.java | 814 ++++++++++-------- .../slrs/sarVppsTree/dao/SarVppsTreeDao.java | 7 + .../adc/da/utils/util/FieldConvertUtil.java | 2 + 5 files changed, 513 insertions(+), 384 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3f94431f..6bfe49c5 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -156,6 +156,9 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); addInterceptor.excludePathPatterns("/api/sarLawsDetailedList/sar-laws-detailed-list/importData"); + //企标标准导入模板下载 + addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile"); + //doc文檔重新轉換 addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 5ff436e6..89656a53 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import cn.hutool.core.util.ZipUtil; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; import com.adc.da.common.FileUnZip; @@ -21,6 +22,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.IOUtils; import com.adc.da.util.utils.StringUtils; @@ -31,7 +33,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,9 +51,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -438,5 +441,67 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception { List tsResources = tsResourceService.getByMenuId(menuId); - if (ObjectUtils.isEmpty(tsResources)){ - return Result.error("请选择目录进行导入"); - } + if (ObjectUtils.isNotEmpty(tsResources)) { + //给出头部信息 + String[] headerExcel = {"企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"}; + //获取文件全称 + String fileNameStr = file.getOriginalFilename(); + //获取最后.的位置 + int pos = fileNameStr.lastIndexOf("."); + //获取压缩文件名称并以小写显示 + String fileStr = fileNameStr.substring(pos + 1).toLowerCase(); + //校验是否是zip文件 + if (!fileStr.equals("zip")) { + return Result.error("请上传zip格式的文件"); + } + //进行拼接获取文件名称 + String fileName = fileNameStr.substring(0, pos); + //获取路径和文件名称 + String path = filePath + "/" + fileName; - //给出头部信息 - String[] headerExcel = {"企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"}; - - //获取文件全称 - String fileNameStr = file.getOriginalFilename(); - //获取最后.的位置 - int pos = fileNameStr.lastIndexOf("."); - //获取压缩文件名称并以小写显示 - String fileStr = fileNameStr.substring(pos + 1).toLowerCase(); - //校验是否是zip文件 - if (!fileStr.equals("zip")){ - return Result.error("请上传zip格式的文件"); - } - //进行拼接获取文件名称 - String fileName = fileNameStr.substring(0,pos); - //获取路径和文件名称 - String path = filePath + "/" + fileName; - - File saveDirectory = new File(path); - //判断saveDirectory中是否是文件夹 - if (!saveDirectory.isDirectory()){ - saveDirectory.mkdir(); - } - //将文件写入到指定路径中 - FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr)); - int countSuccess = 0; - try { - //解压缩 - String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path); - //获取文件信息 - List fileList = readImpExcelFile(zipEntryName); - //判断获取到的文件数量 - if (fileList.size() < 1){ - return Result.error("上传的文件是空文件"); - } - //File excelfile = fileList.get(0); - int excel = 0; - for (File fileInfo:fileList){ - String infoJson = ""; - if (fileInfo.getName().contains(".xls") || fileInfo.getName().contains(".xlsx")) { - excel =excel+1; - if (excel > 1){ - return Result.error("导入了多个Excel文件"); + File saveDirectory = new File(path); + //判断saveDirectory中是否是文件夹 + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + //将文件写入到指定路径中 + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + "/" + fileNameStr)); + int countSuccess = 0; + try { + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path); + //获取文件信息 + List fileList = readImpExcelFile(zipEntryName); + //判断获取到的文件数量 + if (fileList.size() < 1) { + return Result.error("上传的文件是空文件"); } - Workbook workbook = null; - try { - workbook = WorkbookFactory.create(fileInfo); - if (workbook != null){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Sheet sheet = workbook.getSheetAt(0); - if (sheet != null){ - StringBuilder sb = new StringBuilder(); - //获取总条数 - int rowNum = sheet.getLastRowNum(); - //循环遍历 - for (int i = 0;i <= rowNum;i++){ - Row row = sheet.getRow(i); - Row headerRow = sheet.getRow(0); - boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); - if (row != null && !isBlank) { - int columNos = headerRow.getLastCellNum();// 表头总共的列数 - Map rowList = new LinkedHashMap<>(); - for (int j = 0; j < columNos; j++) { - Cell cell = row.getCell(j); - Cell headerCell = headerRow.getCell(j); - if (cell != null) { - if (i == 0) { - cell.setCellType(CellType.STRING); - sb.append(cell.getStringCellValue() + ","); - } else { - if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { - Date d = cell.getDateCellValue(); - rowList.put(headerCell.getStringCellValue(), sdf.format(d)); - } else { - cell.setCellType(CellType.STRING); - rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); - } - } - } else { - if (i != 0) { - rowList.put(headerCell.getStringCellValue(), ""); - } - } - } - String fields = StringUtils.join(headerExcel); - String excelHeader = sb.toString(); - if (!fields.equals(excelHeader)) { - workbook.close(); - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); - } - SarBussStandAttrInfoExecl sarBussStandAttrInfo = new SarBussStandAttrInfoExecl(); - if (i != 0) { + //File excelfile = fileList.get(0); + int excel = 0; + for (File fileInfo : fileList) { + String infoJson = ""; + if (fileInfo.getName().contains(".xls") || fileInfo.getName().contains(".xlsx")) { + excel = excel + 1; + if (excel > 1) { + return Result.error("导入了多个Excel文件"); + } + Workbook workbook = null; + try { + workbook = WorkbookFactory.create(fileInfo); + if (workbook != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null) { + StringBuilder sb = new StringBuilder(); + //获取总条数 + int rowNum = sheet.getLastRowNum(); + //循环遍历 + for (int i = 0; i <= rowNum; i++) { + Row row = sheet.getRow(i); + Row headerRow = sheet.getRow(0); + boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); + if (row != null && !isBlank) { + int columNos = headerRow.getLastCellNum();// 表头总共的列数 + Map rowList = new LinkedHashMap<>(); + for (int j = 0; j < columNos; j++) { + Cell cell = row.getCell(j); + Cell headerCell = headerRow.getCell(j); + if (cell != null) { + if (i == 0) { + cell.setCellType(CellType.STRING); + sb.append(cell.getStringCellValue() + ","); + } else { + if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { + Date d = cell.getDateCellValue(); + rowList.put(headerCell.getStringCellValue(), sdf.format(d)); + } else { + cell.setCellType(CellType.STRING); + rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); + } + } + } else { + if (i != 0) { + rowList.put(headerCell.getStringCellValue(), ""); + } + } + } + String fields = StringUtils.join(headerExcel); + String excelHeader = sb.toString(); + if (!fields.equals(excelHeader)) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + SarBussStandAttrInfoExecl sarBussStandAttrInfo = new SarBussStandAttrInfoExecl(); + if (i != 0) { - String standSort = rowList.get("企标类别"); - if (StringUtils.isNotBlank(standSort)){ - if (standSort.length() > 100){ - return Result.error("企标类别输入过长"); - } - sarBussStandAttrInfo.setStandSort(standSort); - }else { - return Result.error("企标类别不能为空"); - } + String standSort = rowList.get("企标类别"); + if (StringUtils.isNotBlank(standSort)) { + if (standSort.length() > 100) { + return Result.error("企标类别输入过长"); + } + sarBussStandAttrInfo.setStandSort(standSort); + } else { + return Result.error("企标类别不能为空"); + } - String standYear = rowList.get("标准年份"); - if (StringUtils.isNotBlank(standYear)){ - if (standYear.length() > 100){ - return Result.error("标准年份输入过长"); - } - sarBussStandAttrInfo.setStandYear(standYear); - }else { - return Result.error("标准年份不能为空"); - } + String standYear = rowList.get("标准年份"); + if (StringUtils.isNotBlank(standYear)) { + if (standYear.length() > 100) { + return Result.error("标准年份输入过长"); + } + sarBussStandAttrInfo.setStandYear(standYear); + } else { + return Result.error("标准年份不能为空"); + } - String standNumber = rowList.get("企标编号"); - sarBussStandAttrInfo.setStandNumber(standNumber); + String standNumber = rowList.get("企标编号"); + sarBussStandAttrInfo.setStandNumber(standNumber); - String standName = rowList.get("中文名称"); - if(StringUtils.isNotBlank(standName)){ - if(standName.length()>100){ - return Result.error("输入的标准名称过长"); - } - sarBussStandAttrInfo.setStandName(standName); - }else { - return Result.error("中文名称不能为空"); - } + String standName = rowList.get("中文名称"); + if (StringUtils.isNotBlank(standName)) { + if (standName.length() > 100) { + return Result.error("输入的标准名称过长"); + } + sarBussStandAttrInfo.setStandName(standName); + } else { + return Result.error("中文名称不能为空"); + } - String standEnName = rowList.get("英文名称"); - sarBussStandAttrInfo.setStandEnName(standEnName); + String standEnName = rowList.get("英文名称"); + sarBussStandAttrInfo.setStandEnName(standEnName); - String textStatusBuss = rowList.get("文本状态"); - if (StringUtils.isNotBlank(textStatusBuss)){ - if (textStatusBuss.length() > 200){ - return Result.error("输入的文本状态过长"); - } + String textStatusBuss = rowList.get("文本状态"); + if (StringUtils.isNotBlank(textStatusBuss)) { + if (textStatusBuss.length() > 200) { + return Result.error("输入的文本状态过长"); + } - switch (textStatusBuss){ - case "发布": - sarBussStandAttrInfo.setTextStatusBuss("6jnqba2mby"); - break; - case "被代替": - sarBussStandAttrInfo.setTextStatusBuss("quxujsuev5"); - break; - case "参考": - sarBussStandAttrInfo.setTextStatusBuss("01i8opy07d"); - break; - case "即将实施": - sarBussStandAttrInfo.setTextStatusBuss("rpvoxsvr60"); - break; - case "有效": - sarBussStandAttrInfo.setTextStatusBuss("9z741h2m3j"); - break; - case "直接上传": - sarBussStandAttrInfo.setTextStatusBuss("t769k1rkcy"); - break; - case "作废": - sarBussStandAttrInfo.setTextStatusBuss("3lqnlgmgcn"); - break; - case "待修订-指的其他企业标准": - sarBussStandAttrInfo.setTextStatusBuss("1w7cegukbs"); - break; - default: - return Result.error("请提供准确的文本状态"); - } - }else { - return Result.error("文本状态不能为空"); - } + switch (textStatusBuss) { + case "发布": + sarBussStandAttrInfo.setTextStatusBuss("6jnqba2mby"); + break; + case "被代替": + sarBussStandAttrInfo.setTextStatusBuss("quxujsuev5"); + break; + case "参考": + sarBussStandAttrInfo.setTextStatusBuss("01i8opy07d"); + break; + case "即将实施": + sarBussStandAttrInfo.setTextStatusBuss("rpvoxsvr60"); + break; + case "有效": + sarBussStandAttrInfo.setTextStatusBuss("9z741h2m3j"); + break; + case "直接上传": + sarBussStandAttrInfo.setTextStatusBuss("t769k1rkcy"); + break; + case "作废": + sarBussStandAttrInfo.setTextStatusBuss("3lqnlgmgcn"); + break; + case "待修订-指的其他企业标准": + sarBussStandAttrInfo.setTextStatusBuss("1w7cegukbs"); + break; + default: + return Result.error("请提供准确的文本状态"); + } + } else { + return Result.error("文本状态不能为空"); + } - SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd"); + String issueTimeStr =rowList.get("发布日期"); + if (issueTimeStr.contains("-")) { + sarBussStandAttrInfo.setIssueTime(issueTimeStr); + }else { + return Result.error("发布日期格式必须为年-月-日"); + } - Date issueTime = sdfs.parse( rowList.get("发布日期")); - String issueTimeStr = sdfs.format(issueTime); - if (StringUtils.isNotBlank(issueTimeStr)){ - sarBussStandAttrInfo.setIssueTime(issueTimeStr); - } + String putTimeStr = rowList.get("企标实施日期"); + if (putTimeStr.contains("-")) { + sarBussStandAttrInfo.setPutTime(putTimeStr); + }else { + return Result.error("企标实施日期格式必须为年-月-日"); + } - Date putTime = sdfs.parse(rowList.get("企标实施日期")); - String putTimeStr = sdfs.format(putTime); - if (StringUtils.isNotBlank(putTimeStr)){ - sarBussStandAttrInfo.setPutTime(putTimeStr); - } + String revisionStatus = rowList.get("企标制修订状态"); + sarBussStandAttrInfo.setRevisionStatus(revisionStatus); + + String qcdw = rowList.get("起草部门"); + if (StringUtils.isNotBlank(qcdw)) { + if (qcdw.length() > 100) { + return Result.error("输入的起草部门过长"); + } + sarBussStandAttrInfo.setQcdw(qcdw); + } - String revisionStatus = rowList.get("企标制修订状态"); - sarBussStandAttrInfo.setRevisionStatus(revisionStatus); + String dtqbbhbuss = rowList.get("代替企标编号"); + sarBussStandAttrInfo.setDtqbbhbuss(dtqbbhbuss); - String qcdw = rowList.get("起草部门"); - if (StringUtils.isNotBlank(qcdw)){ - if (qcdw.length() > 100){ - return Result.error("输入的起草部门过长"); - } - sarBussStandAttrInfo.setQcdw(qcdw); - } - - String fzrqbuss = rowList.get("废止日期"); - if (StringUtils.isNotBlank(fzrqbuss)){ - sarBussStandAttrInfo.setFzrqbuss(fzrqbuss); - } + String fsrqbuss = rowList.get("复审日期"); + if (fsrqbuss.contains("-")) { + sarBussStandAttrInfo.setFsrqbuss(fsrqbuss); + }else { + return Result.error("复审日期格式必须为年-月-日"); + } - String dtqbbhbuss = rowList.get("代替企标编号"); - sarBussStandAttrInfo.setDtqbbhbuss(dtqbbhbuss); + String qcrbuss = rowList.get("起草人"); + if (StringUtils.isNotBlank(qcrbuss)) { + if (qcrbuss.length() > 100) { + return Result.error("输入的起草人过长"); + } + sarBussStandAttrInfo.setQcrbuss(qcrbuss); + } - String fsrqbuss = rowList.get("复审日期"); - if (StringUtils.isNotBlank(fsrqbuss)){ - sarBussStandAttrInfo.setFsrqbuss(fsrqbuss); - } - - - String qcrbuss = rowList.get("起草人"); - if (StringUtils.isNotBlank(qcrbuss)){ - if (qcrbuss.length() > 100){ - return Result.error("输入的起草人过长"); - } - sarBussStandAttrInfo.setQcrbuss(qcrbuss); - } - - String bdtqbbhbuss = rowList.get("被代替企标编号"); - sarBussStandAttrInfo.setBdtqbbhbuss(bdtqbbhbuss); + String bdtqbbhbuss = rowList.get("被代替企标编号"); + sarBussStandAttrInfo.setBdtqbbhbuss(bdtqbbhbuss); //// //采用标准 13 - String cybz = rowList.get("采用标准"); - sarBussStandAttrInfo.setCybz(cybz); + String cybz = rowList.get("采用标准"); + sarBussStandAttrInfo.setCybz(cybz); - String wjscrybuss = rowList.get("文件上传人员"); - sarBussStandAttrInfo.setWjscrybuss(wjscrybuss); + String wjscrybuss = rowList.get("文件上传人员"); + sarBussStandAttrInfo.setWjscrybuss(wjscrybuss); //// //采标程度 15 - String cycd = rowList.get("采标程度"); - sarBussStandAttrInfo.setCycd(cycd); + String cycd = rowList.get("采标程度"); + sarBussStandAttrInfo.setCycd(cycd); //// //引用标准 16 - String yybz = rowList.get("引用标准"); - sarBussStandAttrInfo.setYybz(yybz); + String yybz = rowList.get("引用标准"); + sarBussStandAttrInfo.setYybz(yybz); - String sycxclass = rowList.get("适用车型"); - sarBussStandAttrInfo.setSycxclass(sycxclass); + String sycxclass = rowList.get("适用车型"); + sarBussStandAttrInfo.setSycxclass(sycxclass); - String nylxclass = rowList.get("能源类型"); - sarBussStandAttrInfo.setNylxclass(nylxclass); + String nylxclass = rowList.get("能源类型"); + sarBussStandAttrInfo.setNylxclass(nylxclass); - String sycpxclass = rowList.get("适用产品线"); - sarBussStandAttrInfo.setSycpxclass(sycpxclass); + String sycpxclass = rowList.get("适用产品线"); + sarBussStandAttrInfo.setSycpxclass(sycpxclass); - String xcsjbuss = rowList.get("上传时间"); - if (StringUtils.isNotBlank(xcsjbuss)){ - sarBussStandAttrInfo.setXcsjbuss(xcsjbuss); - } + //上传时间 + Date date = new Date(); + String format = sdf.format(date); + sarBussStandAttrInfo.setXcsjbuss(format); - String txlbbuss = rowList.get("体系类别"); - sarBussStandAttrInfo.setTxlbbuss(txlbbuss); + String txlbbuss = rowList.get("体系类别"); + sarBussStandAttrInfo.setTxlbbuss(txlbbuss); //// //备案日期 22 - String barq = rowList.get("备案日期"); - sarBussStandAttrInfo.setBarq(barq); + String barq = rowList.get("备案日期"); + if (barq.contains("-")){ + sarBussStandAttrInfo.setBarq(barq); + }else { + return Result.error("备案日期格式必须为年-月-日"); + } + //// //关联模块-乘用车VPPS编码 23 - String cycvppsbmbuss = rowList.get("关联模块-乘用车VPPS编码"); - sarBussStandAttrInfo.setCycvppsbmbuss(cycvppsbmbuss); + String cycvppsbmbuss = rowList.get("关联模块-乘用车VPPS编码"); + sarBussStandAttrInfo.setCycvppsbmbuss(cycvppsbmbuss); -//// //关联模块--乘用车vpps中文名称 24 - String cycvppscnbuss = rowList.get("关联模块--乘用车vpps中文名称"); - sarBussStandAttrInfo.setCycvppscnbuss(cycvppscnbuss); + // 关联模块-乘用车VPPS名称 24 + String cycvppscnbuss = sarVppsTreeDao.getCycvppscnbuss(sarBussStandAttrInfo.getCycvppsbmbuss()); + sarBussStandAttrInfo.setCycvppscnbuss(cycvppscnbuss); //// //关联模块--卡车VPPS编码 25 - String kcvppsbmbuss = rowList.get("关联模块--卡车VPPS编码"); - sarBussStandAttrInfo.setKcvppsbmbuss(kcvppsbmbuss); + String kcvppsbmbuss = rowList.get("关联模块--卡车VPPS编码"); + sarBussStandAttrInfo.setKcvppsbmbuss(kcvppsbmbuss); -//// //关联模块--卡车vpps中文名称 26 - String kcvppscnbuss = rowList.get("关联模块--卡车vpps中文名称"); - sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss); + //关联模块--卡车VPPS名称 26 + String kcvppscnbuss = sarVppsTreeDao.getKcvppscnbuss(sarBussStandAttrInfo.getKcvppsbmbuss()); + sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss); + String fbgbuss = rowList.get("发布稿附件"); + if (fbgbuss != null && !fbgbuss.equals("")) { + String[] split = fbgbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + } + } + sarBussStandAttrInfo.setFbgbuss(s); + } + } - String fbgbuss = rowList.get("发布稿附件"); - if (fbgbuss != null && !fbgbuss.equals("")) { - String[] split = fbgbuss.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setFbgbuss(s); - } - } + String bzsmbuss = rowList.get("编制说明附件"); + if (bzsmbuss != null && !bzsmbuss.equals("")) { + String[] split = bzsmbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + } + } + sarBussStandAttrInfo.setBzsmbuss(s); + } + } - String bzsmbuss = rowList.get("编制说明附件"); - if (bzsmbuss != null && !bzsmbuss.equals("")) { - String[] split = bzsmbuss.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setBzsmbuss(s); - } - } + String lsbbbuss = rowList.get("历史版本附件"); + if (lsbbbuss != null && !lsbbbuss.equals("")) { + String[] split = lsbbbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + } + } + sarBussStandAttrInfo.setLsbbbuss(s); + } + } - String lsbbbuss = rowList.get("历史版本附件"); - if (lsbbbuss != null && !lsbbbuss.equals("")) { - String[] split = lsbbbuss.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setLsbbbuss(s); - } - } + String qtwjbuss = rowList.get("其他文件附件"); + if (qtwjbuss != null && !qtwjbuss.equals("")) { + String[] split = qtwjbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx") || split2.equals("png")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx/png格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx/png格式的附件"); + } + } + sarBussStandAttrInfo.setQtwjbuss(s); + } + } - String qtwjbuss = rowList.get("其他文件附件"); - if (qtwjbuss != null && !qtwjbuss.equals("")) { - String[] split = qtwjbuss.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setQtwjbuss(s); - } - } + String xgd = rowList.get("修改单附件"); + if (xgd != null && !xgd.equals("")) { + String[] split = xgd.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + } + } + sarBussStandAttrInfo.setXgd(s); + } + } - String xgd = rowList.get("修改单附件"); - if (xgd != null && !xgd.equals("")) { - String[] split = xgd.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setXgd(s); - } - } + String glwjbuss = rowList.get("关联文件附件"); + if (glwjbuss != null && !glwjbuss.equals("")) { + String[] split = glwjbuss.split(","); + String s = ""; + if (split.length != 0) { + for (int j = 0; j < split.length; j++) { + String fjName = split[j]; + int one = fjName.lastIndexOf("."); + String split2 = fjName.substring(one + 1).toLowerCase(); + if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) { + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0] + split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())) { + s += "," + attFileVo.getAttId(); + } else { + s = attFileVo.getAttId(); + } + } else { + logger.info(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + return Result.error(fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件"); + } + } + sarBussStandAttrInfo.setGlwjbuss(s); + } + } - String glwjbuss = rowList.get("关联文件附件"); - if (glwjbuss != null && !glwjbuss.equals("")) { - String[] split = glwjbuss.split(","); - String s = ""; - if (split.length != 0) { - for (int j = 0; j < split.length; j++) { - String name = fileInfo.getName(); - String[] split1 = fileInfo.toString().split(name); - File files = new File(split1[0] + split[j]); - AttFileVo attFileVo = attFileEOService.saveFileInfo(files); - if (StringUtils.isNotBlank(attFileVo.getId())) { - s += "," + attFileVo.getAttId(); - } else { - s = attFileVo.getAttId(); - } - } - sarBussStandAttrInfo.setGlwjbuss(s); - } - } + List list = new ArrayList<>(); + list.add(sarBussStandAttrInfo); - List list = new ArrayList<>(); - list.add(sarBussStandAttrInfo); + com.alibaba.fastjson.JSONArray json = com.alibaba.fastjson.JSONArray.parseArray(JSON.toJSONString(list)); + com.alibaba.fastjson.JSONObject jsonObjects = null; + for (int j = 0; j < json.size(); j++) { + jsonObjects = json.getJSONObject(j); + } + infoJson = String.valueOf(jsonObjects); - com.alibaba.fastjson.JSONArray json = com.alibaba.fastjson.JSONArray.parseArray(JSON.toJSONString(list)); - com.alibaba.fastjson.JSONObject jsonObjects = null; - for (int j = 0; j < json.size(); j++) { - jsonObjects = json.getJSONObject(j); - } - infoJson = String.valueOf(jsonObjects); - - //入库 - processCreateBuss(infoJson); - countSuccess++; - } - } - } - } - } - }catch (Exception e){ - FileUnZip.deleteDir(saveDirectory); - return Result.error("导入失败,请查看需要导入的企标标准号和企标名称是否已存在"); - } - } - } - String msg = "成功导入" + countSuccess + "条"; - return Result.success("",msg,null); - }catch (Exception e){ - FileUnZip.deleteDir(saveDirectory); - return Result.error("导入失败,没有可导入的数据,请检查!"); - } + //入库 + processCreateBuss(infoJson); + countSuccess++; + } + } + } + } + } + } catch (Exception e) { + FileUnZip.deleteDir(saveDirectory); + return Result.error("导入失败,请查看需要导入的企标标准号和企标名称是否已存在"); + } + } + } + String msg = "成功导入" + countSuccess + "条"; + return Result.success("", msg, null); + } catch (Exception e) { + FileUnZip.deleteDir(saveDirectory); + return Result.error("导入失败,没有可导入的数据,请检查!"); + } + }else { + return Result.error("请选择目录进行导入"); + } } private static List readImpExcelFile(String path) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java index b91948c6..425473c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.sarVppsTree.dao; import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarVppsTreeDao extends BaseMapper { + @Select("select sar_vpps_tree.CHINESE_NAME from sar_vpps_tree where sar_vpps_tree.VPPS_CODE = #{cycvppsbmbuss} and sar_vpps_tree.TYPE = 'car';") + String getCycvppscnbuss(@Param("cycvppsbmbuss") String cycvppsbmbuss); + + @Select("select sar_vpps_tree.CHINESE_NAME from sar_vpps_tree where sar_vpps_tree.VPPS_CODE = #{kcvppsbmbuss} and sar_vpps_tree.TYPE = 'truck';") + String getKcvppscnbuss(@Param("kcvppsbmbuss") String kcvppsbmbuss); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 1d3cf766..f56e16a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -68,6 +68,8 @@ public class FieldConvertUtil { "在产车实施日期(项目),EOP实施日期(项目),实施说明,认证交付物,认证对象,监管类型,适用车辆类型,责任部门,相关部门,FO,项目评估角色," + "文本说明,标签,要求类型,清单类型,入库模块"; + public static String exportFieldName = "企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件"; + /*** * @Description: Clob类型 转String * @Author: super_liu From fc3704555acfccba4115842b0344240e2fe302d2 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 30 Mar 2023 16:47:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 2 ++ .../service/impl/SarBussionessStandServiceImpl.java | 9 +++++---- .../sarResource/service/impl/TsResourceServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index e873891a..cc1a8c35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -186,6 +186,8 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { //备案日期 private String barq; + private String menuId; + @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 69d5d75e..767e8b85 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2041,7 +2041,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception { List tsResources = tsResourceService.getByMenuId(menuId); - if (ObjectUtils.isNotEmpty(tsResources)) { + if (ObjectUtils.isEmpty(tsResources)) { + return Result.error("请选择需要导入的目录"); + } //给出头部信息 String[] headerExcel = {"企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"}; @@ -2486,6 +2488,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = new ArrayList<>(); list.add(sarBussStandAttrInfo); @@ -2516,9 +2520,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl readImpExcelFile(String path) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 418fd126..dc4a8ae9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -494,7 +494,7 @@ public class TsResourceServiceImpl extends ServiceImpl getByMenuId(String menuId) throws Exception{ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PARENT_ID",menuId); + queryWrapper.eq("ID",menuId); List tsResources = baseMapper.selectList(queryWrapper); return tsResources; }