diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c07b722cb..1b49e45d7 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -894,6 +894,10 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '149678 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266'; +-- 项目状态 project_status 2022-08-12 +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = '1513769417081630721'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; + -- 表字段 英文修改 2022-08-11 已同步生产环境 -- OCR识别转换记录表 @@ -913,3 +917,13 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHER UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d'; +-- 文档库信息表 2022-08-12 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06'; +-- 参数项收集清单 2022-08-12 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Batch' WHERE `id` = '161c35a16e92682972dd1aeb26151fa2'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Name' WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Field' WHERE `id` = 'ed57f77975218560b37ea497a20109c6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java index ce0611de7..2f8df3da9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java @@ -11,15 +11,15 @@ import java.util.Map; * @Date: Created in 15:17 2022/5/7 */ public enum CollectManifestStateEnum { - WAIT_COLLECT("待发起收集","Wait Collect","1"), - WAIT_SDT("待工程接口人处理","Wait Sdt","2"), - SDT_BACK("工程接口人退回","Sdt Back","3"), - WAIT_FILL("待填写","Wait Fill","4"), - DRE_BACK("填写人退回","Dre Back","5"), - SUBMIT("已提交","Submit","6"), - CERT_BACK("认证工程师退回","Cert Back","7"), - SYNC_REPORT("已同步至上报库","Sync Report","8"), - CHANGE("变更","Change","9"); + WAIT_COLLECT("待发起收集","To be collected","1"), + WAIT_SDT("待工程接口人处理","To be processed by eng. interface","2"), + SDT_BACK("工程接口人退回","Rejected by eng. interface","3"), + WAIT_FILL("待填写","To be filled","4"), + DRE_BACK("填写人退回","Rejected by the applicant","5"), + SUBMIT("已提交","Submitted","6"), + CERT_BACK("认证工程师退回","Rejected by homo engineer","7"), + SYNC_REPORT("已同步至上报库","Synced to library","8"), + CHANGE("变更","Modify","9"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java index 15938c07a..b48150942 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java @@ -9,9 +9,9 @@ import java.util.List; * @Date: Created in 16:47 2022/5/11 */ public enum CollectManifestUserTypeEnum { - HOMO("认证工程师", "Homologation Engineer", "homo"), - SDT("工程接口人", "Sdt People","sdt"), - DRE("填写人", "Dre People","dre"), + HOMO("认证工程师", "Homo Engineer", "homo"), + SDT("工程接口人", "Eng. Interface","sdt"), + DRE("填写人", "Filled by","dre"), STUDIO("R&H Studio","R&H Studio","studio"), MANAGER("R&H Manager","R&H Manager","manager"), ADMIN("系统","Administrator","admin"), diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a54eedb2b..0bba80865 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1063,10 +1063,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { @@ -1079,7 +1084,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.HOMO.getName()); @@ -1090,7 +1095,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.SDT.getName()); @@ -1101,7 +1106,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.DRE.getName()); @@ -1112,7 +1117,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.STUDIO.getName()); @@ -1140,6 +1145,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl toLowerCaseOfList(List list) { + List newList = list; + if (CollectionUtil.isNotEmpty(list)) { + newList = list.stream().map(String::toLowerCase).collect(Collectors.toList()); + } + return newList; + } + @Override public Map isCollectFinished(String paramsManifestId) { Map map = new HashMap<>(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 8316dee8e..b2dadc5c4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -386,7 +386,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); @@ -950,7 +950,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); @@ -1235,7 +1235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); //获取总记录数 @@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); resultJsonEU = (JSONObject) myJsonEU.get("data"); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); } } @@ -261,21 +261,22 @@ public class SyncDataServiceImpl implements ISyncDataService{ for(PPEmployee ppEmployee:ppEmployeeList){ try { PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee); - //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { - //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + if (StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + ppEmployee.setWorker_user_id(ppEmployee.getWorker_user_id().toLowerCase()); // 转小写 + + //1.判断当前账号是否已添加到用户中 + if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { + //删除数据库中与该账户相同的数据 // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); localUserMap.put(ppEmployee.getWorker_user_id(), newUser); - } - - } else { - SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); - log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); - if(userEO != null) { - sysUserService.updatePPUserInfo(userEO, ppEmployee); + }else { + SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); + log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); + if (userEO != null) { + sysUserService.updatePPUserInfo(userEO, ppEmployee); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 2623a233d..696355fcb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -2,14 +2,13 @@ package com.jero.modules.compare.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -17,6 +16,8 @@ import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -50,22 +51,33 @@ public class SarFileCompareInfoController extends JeroController queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(name = "cut", defaultValue = "cn") String cut, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); + public Result queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "cut", defaultValue = "cn") String cut, + @RequestParam(name = "serialNumber", defaultValue = "") String serialNumber, + @RequestParam(name = "title", defaultValue = "") String title, + @RequestParam(name = "releaseState", defaultValue = "") String releaseState, + HttpServletRequest req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.PUBLISHED.getValue()); - queryWrapper.orderByAsc("create_by"); + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getCreateBy, sysUser.getUsername()).or().eq(SarFileCompareInfo::getReleaseState, ReleaseConditionEnum.PUBLISHED.getValue())); + if (StringUtils.isNotBlank(serialNumber)) { + String finalSerialNumber = serialNumber.replace("%", "\\%");; + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.like(SarFileCompareInfo::getSerialNumberLeft, finalSerialNumber).or().like(SarFileCompareInfo::getSerialNumberRight, finalSerialNumber)); + + } + if (StringUtils.isNotBlank(title)) { + String finalTitle = title.replace("%", "\\%"); + queryWrapper.and(i -> i.like(SarFileCompareInfo::getTitleLeft, finalTitle).or().like(SarFileCompareInfo::getTitleRight, finalTitle)); + } + if (StringUtils.isNotBlank(releaseState)) { + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getReleaseState, releaseState)); + } + queryWrapper.orderByDesc(SarFileCompareInfo::getCreateTime); Page page = new Page<>(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); for (SarFileCompareInfo info : pageList.getRecords()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index f0d77ba71..24d378f67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -233,7 +233,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(leftInfo.getSerialNumber()); if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { @@ -244,7 +244,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList1 = bussDocumentLibraryEOService.getListBySerialNumber(rightInfo.getSerialNumber()); if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList1)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index baee6ebaa..30df6c310 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -222,7 +222,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1, true); + List res = getSubFolder(superFolder, list, 1); Collections.sort(res); return res; } catch (Exception ex) { @@ -235,22 +235,22 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level, boolean needAuth) { + private List getSubFolder(String supId, List list, int level) { List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { int childLevel = level + 1; - if (!needAuth || haveViewAuth(erf.getId())) { + if (haveViewAuth(erf.getId())) { ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); date.setAuthManageIdsName(erf.getAuthManageIdsName()); date.setAuthManageIds(erf.getAuthManageIds()); date.setAuthViewIdsName(erf.getAuthViewIdsName()); date.setAuthViewIds(erf.getAuthViewIds()); - date.setChildren(getSubFolder(erf.getId(), list, childLevel, false)); + date.setChildren(getSubFolder(erf.getId(), list, childLevel)); date.sortChildren(); resList.add(date); } else { - resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + resList.addAll(getSubFolder(erf.getId(), list, childLevel)); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java index c7b51528e..2f2ab5bf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java @@ -67,6 +67,11 @@ public class LarkController { log.info("给"+employeeId+"用户推送知识库一级分类菜单:=========================================================="); feishuService.sendKnowledgeBaseTypeCard(employeeId.split(",")); } + //判断用户发送的消息内容，如果包含"负责人" 那么给用户推送知识库分类负责人信息 + if(StringUtils.contains(text,"负责人")){ + log.info("给"+employeeId+"用户推送知识库负责人:=========================================================="); + feishuService.sendKnowledgeBaseTypeChargePersonCard(employeeId.split(",")); + } } } return decrypt; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index 5c8a8d213..a1999a118 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -56,4 +56,10 @@ public interface IFeishuService { * @param jsonObject */ void sendKnowledgeBaseInfoCard(JSONObject jsonObject); + + /** + * 发送知识库分类负责人卡片消息 （用户输入负责人的时候） + * @param split + */ + void sendKnowledgeBaseTypeChargePersonCard(String[] split); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index b1d6f2b43..0f51306b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -213,6 +213,16 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("}"); contentSb.append("}"); } + if (StrUtil.isNotEmpty(feishuMsgVo.getAssignee())){ + contentSb.append(","); + contentSb.append("{"); + contentSb.append("\"is_short\": false,"); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"**Assignee：** " + feishuMsgVo.getAssignee() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("}"); + } if (StrUtil.isNotEmpty(feishuMsgVo.getDueDate())){ contentSb.append(","); contentSb.append("{"); @@ -542,4 +552,83 @@ public class FeishuServiceImpl implements IFeishuService { } } + @Override + public void sendKnowledgeBaseTypeChargePersonCard(String[] userIds) { + String token = null; + try { + token = getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + String sendJson = " {\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"点击下方的分类查看常见问题\"\n" + + " },\n" + + " \"template\": \"green\"\n" + + " }\n" + + "}"; + JSONObject jsonObject = JSONObject.parseObject(sendJson); + JSONArray elements = new JSONArray(); + JSONObject element = new JSONObject(); + element.put("tag","action"); + element.put("layout","bisected"); + + //获取分类 + List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList); + + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { + JSONObject buttonObject = new JSONObject(); + JSONObject text = new JSONObject(); + JSONObject value = new JSONObject(); + buttonObject.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]"); + value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId()); + + buttonObject.put("text",text); + buttonObject.put("type","primary"); + buttonObject.put("value",value); + actions.add(buttonObject); + } + + element.put("actions",actions); + + + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 631a32d97..0aee3596c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -24,5 +24,7 @@ public class FeishuMsgVo { private String url; //回调的网址 + private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性） + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 4a36ca982..234a61609 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -72,9 +72,11 @@ public class CountryCardManageReleaseEOController extends JeroController> queryList() { - List list = countryCardManageReleaseEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + @RequestParam(name="cut", defaultValue="cn") String cut) { + List list = countryCardManageReleaseEOService.queryList(countryCardManageReleaseEO,req,cut); + return Result.OK(cut,list); } /** @@ -194,8 +196,9 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag) { - Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag); + public Result> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag, + @RequestParam(name = "cut",required = true) String cut) { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag,cut); return result; } @@ -208,7 +211,8 @@ public class CountryCardManageReleaseEOController extends JeroController> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) { + String cut = params.getString("cut"); List list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params); - return Result.OK(list); + return Result.OK(cut,list); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 392c7e437..0af88f36f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -60,7 +61,9 @@ public interface ICountryCardManageReleaseEOService extends IService queryList(); + List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut); /** * 处理数据 @@ -79,7 +82,7 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(String queryFlag); + Result> getApplyMarketList(String queryFlag,String cut); List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index e7252d647..c5226def4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -29,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布表 * @Author: jero-boot @@ -123,8 +127,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } @Override @@ -199,7 +207,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList(String queryFlag) { + public Result> getApplyMarketList(String queryFlag,String cut) { List result = new ArrayList<>(); //获取所有的适用地区 @@ -249,6 +257,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl { + data.setText(data.getTextEn()); + }); + } + return Result.OK(result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index 43086bc37..c81eb6e64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -171,6 +172,12 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl { + tempItem.setItemText(tempItem.getEnName()); + }); + } + countryCardTemp.setCountryCardTempItemEOList(collect); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 659adc94d..46058eaca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -44,7 +44,6 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList= projectLibraryBaseService.queryPageList(params); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 34169acd6..13c1ff160 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,16 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("清单确认"," Checklist confirmation"), - LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), - DESIGN_DEADLINE("设计符合性","Design compliance"), + LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), + LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), + DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),// name:认证开始 value:Certification begins - ATTESTATION_END_TIME("认证批准","Type Approval"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性","Verify compliance"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证结束","Homo Completion"),// name:认证开始 value:Certification begins + ATTESTATION_END_TIME("认证开始","Homo KO"),// name:认证结束 value:End of certification + VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 023bd336c..525b4f7e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2273,10 +2273,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2291,10 +2292,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2309,15 +2311,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() - + ". you sumitted has been approved."; + + " you submitted has been approved."; msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + ": You have a design compliance task to complete"; @@ -2335,7 +2338,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) { + newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ @@ -149,6 +153,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) { + newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } @@ -289,6 +296,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); //法规月报id List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + //获取章节目录 List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); @@ -311,6 +336,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() @@ -356,6 +383,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); + if(StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + lawsMonthlyReportWriteEO.setLawsContactName(substring); + } + } + } + @Override public void exportMonthlyReport(HttpServletResponse response, HttpServletRequest request, @@ -411,8 +456,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list(); lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList()); - - String path = uploadpath + "/tempZip"; + long l = System.currentTimeMillis(); + String path = uploadpath + "/tempZip"+l; File fileTemp = new File(path); if (fileTemp.exists()) { fileTemp.delete(); @@ -432,16 +477,34 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + if(StringUtils.isBlank(lawsMonthlyReportWriteEO.getIds())){ + //导出全部 + list = this.list(); + }else{ + //导出部分 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(","))); + list = this.list(lambdaQueryWrapper); + } + for (LawsMonthlyReportWriteEO monthlyReportWriteEO : list) { + monthlyReportWriteEO.setExportState(ExportStateEnum.HAS_BEEN_EXPORT.getValue()); + } + if(list.size() != 0){ + this.updateBatchById(list); + } } @@ -461,10 +524,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList = lawsMonthlyReportTitleTemplateEOService.list(wrapper); //蔚来汽车法规月报-202004-主页面-CN //NIO Monthly Report on Automobile Regulations-202004-Main Page-EN - String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"主页面-CN.docx"; - String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; - String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; - String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; + String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-CN.docx"; + String memoriesChapterEN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-EN.docx"; +// String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; + String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; + String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; +// String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth(); String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 5234a90d6..e85f66024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -2,6 +2,7 @@ package com.jero.modules.report.util; import cn.hutool.core.util.ObjectUtil; import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.entity.NewOpinionTemplateEO; import com.jero.modules.report.entity.NewStandardTemplateEO; @@ -173,7 +174,8 @@ public class WordUtil { XWPFRun run = logo.createRun(); String imgFile = logoFilePath; - InputStream is = new FileInputStream(imgFile); + InputStream is = WordUtil.class.getClassLoader().getResourceAsStream("static/home/weilai.png"); +// InputStream is = new FileInputStream(imgFile); XWPFPicture picture = run.addPicture(is, XWPFDocument.PICTURE_TYPE_PNG, imgFile, Units.toEMU(95), Units.toEMU(35)); String blipID = ""; for(XWPFPictureData picturedata : header.getAllPackagePictures()) { //这段必须有，不然打开的logo图片不显示 diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 91e4e0dfd..72d278ab7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -211,7 +211,7 @@ module.exports = { DataLogManagementPage: 'Data Log Management Page', VersionNumber: 'Version', DataContent: 'Data Content', - creator: 'Creator', + creator: 'Created By', selectTwoPiecesData: 'Please select two pieces of data', selectSameDatabase: 'Please select the same database table and data ID for comparison', DataComparison: 'Data Comparison', @@ -702,7 +702,7 @@ module.exports = { pleaseEnterTheCorrectWebAddress: 'Please enter the correct web address', updateTime: 'Update Time', comment: 'Comment', - historicalVersion: 'Historical Version', + historicalVersion: 'History Version', versionName: 'Version Name', finalizationTime: 'Finalization Time', setting: 'Setting', @@ -1049,24 +1049,24 @@ module.exports = { NNNiONumber: 'Number', NNiONumber: 'NIO Number', ParameterNo: 'Number', - NRequired: 'Is Must', + NRequired: 'Required', NParameterName: 'Para Name', NtechnicalField: 'Tech field', NparameterBatch: 'Params Batch', NareaOfResponsibility: 'Responsible Field', NParameterDescription: 'Description', - NcertificationCategory: 'Cert', - NcontrolType: 'Control Type', - NcontrolVerification: 'Control Verify', - NcontrolAlternatives: 'Control Values', + NcertificationCategory: 'Cert Category', + NcontrolType: 'Control Componet', + NcontrolVerification: 'Validate Componet', + NcontrolAlternatives: 'Componet Value', DefaultValue: 'Default Value', NattachmentTemplate: 'File Template', Ntext: 'Text', - NDropdownradio: 'Pull Single', - NDropdownmultipleselection: 'Pull More', + NDropdownradio: 'Pull single', + NDropdownmultipleselection: 'Pull more', Nenclosure: 'File', - Atext: 'Text+Pull Single', - Btext: 'Text+Pull More', + Atext: 'Text+Pull single', + Btext: 'Text+Pull more', Ctext: 'Text+File', Dtext: 'Pull single+File', Etext: 'Pull more+File', @@ -1213,7 +1213,7 @@ module.exports = { displayPermission: 'Display permission', authorizedUser: 'Authorized user', problemClassification: 'Problem classification', - market: 'market', + market: 'Market', documentNumber: 'Document Number', documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', @@ -1255,8 +1255,10 @@ module.exports = { deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', + areResponsibilityAreaInformationBatch:'Are you sure you want to modify the responsibility area information in batch', issuedBy:'Issued by', pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', + weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 89ac86b7b..bdd85ecab 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -495,7 +495,7 @@ module.exports = { toBeConfirmed: '待确认', Operator: '操作人', role: '角色', - operationContent: '操作内容', + OperationContent: '操作内容', operationTime: '操作时间', toDoProcess: '待办流程', processDone: '已办流程', @@ -1357,8 +1357,10 @@ module.exports = { deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', + areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息', issuedBy:'发布人', pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport:'蔚来法规月报', } \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 2c5c7b703..ced5cdd61 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -1,7 +1,7 @@