From 2d241c9c6f2e87ff0d9b5def4f235eea04b4f71d Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 11 Oct 2022 10:16:24 +0800 Subject: [PATCH 01/54] bug --- .../modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 429a8d72f..1a233e147 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 @@ -278,6 +278,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl Date: Tue, 11 Oct 2022 11:25:03 +0800 Subject: [PATCH 02/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExtRepoFolderServiceImpl.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) 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 1a233e147..442ab9d67 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 @@ -241,7 +241,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { - //int childLevel = level + 1; if (haveViewAuth(erf.getId())) { ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); boolean parentRightClick = haveManageAuth(erf.getId()); @@ -252,7 +251,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl(),level,parentRightClick)); + date.setChildren(subFolderTree(new ArrayList(),date)); date.sortChildren(); resList.add(date); } else { @@ -265,20 +264,18 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl subFolderTree(String folder,List childTree,int level,boolean parentRightClick) { - int childLevel = level + 1; - List listBySupFolder = getListBySupFolder(folder); - ExtRepoFolder father = queryById(folder); + private List subFolderTree(List childTree,ERFTreeData father) { + int childLevel = father.getLevel() + 1; + List listBySupFolder = getListBySupFolder(father.getKey()); for (ExtRepoFolder extRepoFolder : listBySupFolder) { ERFTreeData date = new ERFTreeData(extRepoFolder.getFolderName(), extRepoFolder.getId(), childLevel, extRepoFolder.getOrderId()); //是否有管理权限 boolean childRightClick = haveManageAuth(extRepoFolder.getId()); - if (parentRightClick||childRightClick) { - childRightClick = true; + if (father.isManager()||childRightClick) { date.setManager(true); } //如果参数为空则延续父文件夹权限，反之用自己的 @@ -296,7 +293,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl(),childLevel,childRightClick)); + date.setChildren(subFolderTree(new ArrayList(),date)); date.sortChildren(); childTree.add(date); } From d7aaf663f8f038e93dcb1f0583d1add27828184d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 11 Oct 2022 14:20:04 +0800 Subject: [PATCH 03/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/store/modules/user.js | 4 +- jero-web/src/utils/compressedData.js | 313 ++++++++++++++++++ .../projectManagement/components/addModel.vue | 1 - 3 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/utils/compressedData.js diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 2b9b58549..ccd43b585 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -11,6 +11,7 @@ import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types' import { welcome } from '@/utils/util' +import { LZString } from '@/utils/compressedData' import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' @@ -146,7 +147,8 @@ const user = { // if (!gData) { // getAction('sys/user/queryUserTreeList', {}).then((res) => { // if (res.success) { - // localStorage.setItem('gData', JSON.stringify(res.result)) + // let index = LZString.compressToUint8Array(JSON.stringify(res.result)).join(',') + // localStorage.setItem('gData', LZString.compressToEncodedURIComponent(index)) // } // }) // } diff --git a/jero-web/src/utils/compressedData.js b/jero-web/src/utils/compressedData.js new file mode 100644 index 000000000..f855f5083 --- /dev/null +++ b/jero-web/src/utils/compressedData.js @@ -0,0 +1,313 @@ +export const LZString = function() { + function f(h, e) { + if (!b[h]) { + b[h] = {}; + for (var i = 0; i < h.length; i++) { + b[h][h.charAt(i)] = i + } + } + return b[h][e] + } + + var c = String.fromCharCode, + g = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", + d = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$", + b = {}, + a = { + compressToBase64: function(h) { + if (null == h) { + return "" + } + var e = a._compress(h, 6, + function(i) { + return g.charAt(i) + }); + switch (e.length % 4) { + default: + case 0: + return e; + case 1: + return e + "==="; + case 2: + return e + "=="; + case 3: + return e + "=" + } + }, + decompressFromBase64: function(e) { + return null == e ? "": "" == e ? null: a._decompress(e.length, 32, + function(h) { + return f(g, e.charAt(h)) + }) + }, + compressToUTF16: function(e) { + return null == e ? "": a._compress(e, 15, + function(h) { + return c(h + 32) + }) + " " + }, + decompressFromUTF16: function(e) { + return null == e ? "": "" == e ? null: a._decompress(e.length, 16384, + function(h) { + return e.charCodeAt(h) - 32 + }) + }, + compressToUint8Array: function(l) { + for (var j = a.compress(l), m = new Uint8Array(2 * j.length), k = 0, h = j.length; h > k; k++) { + var i = j.charCodeAt(k); + m[2 * k] = i >>> 8, + m[2 * k + 1] = i % 256 + } + return m + }, + decompressFromUint8Array: function(k) { + if (null === k || void 0 === k) { + return a.decompress(k) + } + for (var l = new Array(k.length / 2), j = 0, h = l.length; h > j; j++) { + l[j] = 256 * k[2 * j] + k[2 * j + 1] + } + var i = []; + return l.forEach(function(e) { + i.push(c(e)) + }), + a.decompress(i.join("")) + }, + compressToEncodedURIComponent: function(e) { + return null == e ? "": a._compress(e, 6, + function(h) { + return d.charAt(h) + }) + }, + decompressFromEncodedURIComponent: function(e) { + return null == e ? "": "" == e ? null: (e = e.replace(/ /g, "+"), a._decompress(e.length, 32, + function(h) { + return f(d, e.charAt(h)) + })) + }, + compress: function(e) { + return a._compress(e, 16, + function(h) { + return c(h) + }) + }, + _compress: function(q, j, w) { + if (null == q) { + return "" + } + var C, I, z, J = {}, + k = {}, + H = "", + E = "", + F = "", + y = 2, + B = 3, + A = 2, + D = [], + x = 0, + G = 0; + for (z = 0; z < q.length; z += 1) { + if (H = q.charAt(z), Object.prototype.hasOwnProperty.call(J, H) || (J[H] = B++, k[H] = !0), E = F + H, Object.prototype.hasOwnProperty.call(J, E)) { + F = E + } else { + if (Object.prototype.hasOwnProperty.call(k, F)) { + if (F.charCodeAt(0) < 256) { + for (C = 0; A > C; C++) { + x <<= 1, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++ + } + for (I = F.charCodeAt(0), C = 0; 8 > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } else { + for (I = 1, C = 0; A > C; C++) { + x = x << 1 | I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I = 0 + } + for (I = F.charCodeAt(0), C = 0; 16 > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } + y--, + 0 == y && (y = Math.pow(2, A), A++), + delete k[F] + } else { + for (I = J[F], C = 0; A > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } + y--, + 0 == y && (y = Math.pow(2, A), A++), + J[E] = B++, + F = String(H) + } + } + if ("" !== F) { + if (Object.prototype.hasOwnProperty.call(k, F)) { + if (F.charCodeAt(0) < 256) { + for (C = 0; A > C; C++) { + x <<= 1, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++ + } + for (I = F.charCodeAt(0), C = 0; 8 > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } else { + for (I = 1, C = 0; A > C; C++) { + x = x << 1 | I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I = 0 + } + for (I = F.charCodeAt(0), C = 0; 16 > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } + y--, + 0 == y && (y = Math.pow(2, A), A++), + delete k[F] + } else { + for (I = J[F], C = 0; A > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + } + y--, + 0 == y && (y = Math.pow(2, A), A++) + } + for (I = 2, C = 0; A > C; C++) { + x = x << 1 | 1 & I, + G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++, + I >>= 1 + } + for (;;) { + if (x <<= 1, G == j - 1) { + D.push(w(x)); + break + } + G++ + } + return D.join("") + }, + decompress: function(e) { + return null == e ? "": "" == e ? null: a._decompress(e.length, 32768, + function(h) { + return e.charCodeAt(h) + }) + }, + _decompress: function(B, C, I) { + var r, F, x, z, q, K, L, E, H = [], + G = 4, + J = 4, + D = 3, + k = "", + j = [], + y = { + val: I(0), + position: C, + index: 1 + }; + for (F = 0; 3 > F; F += 1) { + H[F] = F + } + for (z = 0, K = Math.pow(2, 2), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + switch (r = z) { + case 0: + for (z = 0, K = Math.pow(2, 8), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + E = c(z); + break; + case 1: + for (z = 0, K = Math.pow(2, 16), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + E = c(z); + break; + case 2: + return "" + } + for (H[3] = E, x = E, j.push(E);;) { + if (y.index > B) { + return "" + } + for (z = 0, K = Math.pow(2, D), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + switch (E = z) { + case 0: + for (z = 0, K = Math.pow(2, 8), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + H[J++] = c(z), + E = J - 1, + G--; + break; + case 1: + for (z = 0, K = Math.pow(2, 16), L = 1; L != K;) { + q = y.val & y.position, + y.position >>= 1, + 0 == y.position && (y.position = C, y.val = I(y.index++)), + z |= (q > 0 ? 1 : 0) * L, + L <<= 1 + } + H[J++] = c(z), + E = J - 1, + G--; + break; + case 2: + return j.join("") + } + if (0 == G && (G = Math.pow(2, D), D++), H[E]) { + k = H[E] + } else { + if (E !== J) { + return null + } + k = x + x.charAt(0) + } + j.push(k), + H[J++] = x + k.charAt(0), + G--, + x = k, + 0 == G && (G = Math.pow(2, D), D++) + } + } + }; + return a +} (); + +// module.exports = LZString \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 30c6324e2..65b190bd4 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -112,7 +112,6 @@ From c40f5f1b7f8e70db439fd4d072e4b746705dfa8b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 12 Oct 2022 10:32:05 +0800 Subject: [PATCH 04/54] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5--=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 148 ++++++++++++++---- 1 file changed, 120 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 12b491960..9127a8e3b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -14,9 +14,11 @@ import com.jero.common.util.RedisUtil; import com.jero.common.util.TokenUtils; import com.jero.modules.dummy.service.impl.DummyInventoryInfoEOServiceImpl; import com.jero.modules.enums.DictCodeEnum; +import com.jero.modules.ocr.entity.User; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.enums.ProjectInventoryFieldEnum; +import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.system.entity.SysDictItem; @@ -967,6 +969,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl oppositeDisposeData(List records, String projectId, String cut) { + //查询所有的用户 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(SysUser::getUsername,SysUser::getId); + List userList = sysUserService.list(wrapper); + Result result = new Result<>(); int row=3; StringBuilder message = new StringBuilder(); @@ -1021,15 +1028,18 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl lawEngineerNameList = Arrays.asList(projectRelatedPersonnel.getLawEngineerName().split(",")); if (CollectionUtils.isNotEmpty(lawEngineerNameList) && StringUtils.isNotBlank(lawEngineerNameList.get(0))) { lawEngineerNameList = lawEngineerNameList.stream().distinct().collect(Collectors.toList()); - lawEngineerUsers=sysUserService.queryUserIdListByNameList(lawEngineerNameList); - if(lawEngineerUsers.size()!=lawEngineerNameList.size()){ - //中英切换提示语 - if(CutEnum.CN.getValue().equals(cut)) { - message.append("导入的法规工程师姓名有误,请检查第" + row + "行"); - }else{ - message.append("The imported law engineer is wrong.Please check line " + row ); - } - } + //验证导入的相关人员 + lawEngineerUsers = personnelMatch(userList, lawEngineerNameList, message, ProjectRoleEnum.REGULATI_ENGINEER.getValue(), cut, row); + +// lawEngineerUsers=sysUserService.queryUserIdListByNameList(lawEngineerNameList); +// if(lawEngineerUsers.size()!=lawEngineerNameList.size()){ +// //中英切换提示语 +// if(CutEnum.CN.getValue().equals(cut)) { +// message.append("导入的法规工程师姓名有误,请检查第" + row + "行"); +// }else{ +// message.append("The imported law engineer is wrong.Please check line " + row ); +// } +// } } if(CollectionUtils.isNotEmpty(lawEngineerUsers)) { @@ -1055,15 +1065,18 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl engineeringInterfacePersonNameList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePersonName().split(",")); if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList) && StringUtils.isNotBlank(engineeringInterfacePersonNameList.get(0))) { engineeringInterfacePersonNameList = engineeringInterfacePersonNameList.stream().distinct().collect(Collectors.toList()); - engineeringInterfacePersonUsers=sysUserService.queryUserIdListByNameList(engineeringInterfacePersonNameList); - if(engineeringInterfacePersonUsers.size()!=engineeringInterfacePersonNameList.size()){ - //中英切换提示语 - if(CutEnum.CN.getValue().equals(cut)) { - message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); - }else{ - message.append("The imported engineering interface person is wrong.Please check line " + row ); - } - } + //验证导入的相关人员 + engineeringInterfacePersonUsers = personnelMatch(userList, engineeringInterfacePersonNameList, message, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), cut, row); + +// engineeringInterfacePersonUsers=sysUserService.queryUserIdListByNameList(engineeringInterfacePersonNameList); +// if(engineeringInterfacePersonUsers.size()!=engineeringInterfacePersonNameList.size()){ +// //中英切换提示语 +// if(CutEnum.CN.getValue().equals(cut)) { +// message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); +// }else{ +// message.append("The imported engineering interface person is wrong.Please check line " + row ); +// } +// } } if(CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) { @@ -1090,8 +1103,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl baseCertificationEngineerList = queryCertificationEngineer(projectId); List baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList()); + //转为小写后在判断 + List baseCertificationEngineerNameListTemp = new ArrayList<>(); + for (String s : baseCertificationEngineerNameList) { + baseCertificationEngineerNameListTemp.add(s.toLowerCase()); + } for(String certificationEngineerName : certificationEngineerNameList){ - if(!baseCertificationEngineerNameList.contains(certificationEngineerName)){ + if(!baseCertificationEngineerNameListTemp.contains(certificationEngineerName.toLowerCase())){ //中英切换提示语 if(CutEnum.CN.getValue().equals(cut)) { message.append("导入的认证工程师姓名不属于该项目,请检查第" + row + "行"); @@ -1101,18 +1119,32 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl personnelMatch(List userList, + List personnelList, + StringBuilder message, + String personnelType, + String cut, + int row){ + int count = 0; + //全部转为小写来匹配 + List sysUserList = new ArrayList<>(); + for (String personnel : personnelList) { + String personnelLower = personnel.toLowerCase(); + for (SysUser sysUser : userList) { + String username = sysUser.getUsername(); + String usernameLower = username.toLowerCase(); + if(personnelLower.equals(usernameLower)){ + sysUserList.add(sysUser); + count ++; + } + } + } + if(personnelList.size() != count){ + //法规工程师异常提示语 + if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){ + if(CutEnum.CN.getValue().equals(cut)) { + message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); + }else{ + message.append("The imported engineering interface person is wrong.Please check line " + row ); + } + } + //认证工程师异常提示语 + if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){ + if(CutEnum.CN.getValue().equals(cut)) { + message.append("导入的认证工程师姓名有误,请检查第" + row + "行"); + }else { + message.append("The imported certification engineer is wrong.Please check line " + row ); + } + } + //工程接口人异常提示语 + if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){ + if(CutEnum.CN.getValue().equals(cut)) { + message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); + }else{ + message.append("The imported engineering interface person is wrong.Please check line " + row ); + } + } + }else{ + return sysUserList; + } + return new ArrayList<>(); + } + @Override public ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); From 6686bd3b1c626b5843effde4ec21da2ee68e8c4b Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 12 Oct 2022 12:13:36 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 124 ++++++++++++++++-- .../src/components/libraryAddForm/index.vue | 1 + .../classificationMaintenanceAdd.vue | 1 + .../components/problemKnowledgeBaseAdd.vue | 2 +- .../components/modules/defaultTemplate.vue | 2 +- .../splitting/modules/SplitAddForm.vue | 1 + jero-web/src/views/externalReports/index.vue | 6 +- .../components/engineeringConfirmation.vue | 1 + .../projectManagement/components/addModel.vue | 6 +- .../components/listOfRelevantPersonnel.vue | 6 +- .../components/personBatting.vue | 2 + 11 files changed, 133 insertions(+), 19 deletions(-) diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 5edbc5c27..02ab1fba8 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -1,16 +1,33 @@ @@ -91,6 +107,8 @@ return { loading: false, gData: [], + valueSelect: [], + dictOptions: [], autoExpandParent: false, checkboxList: [], expandedKeys: [], @@ -111,7 +129,35 @@ } }, mounted() { - + this.valueSelect = [] + this.dictOptions = [] + setTimeout(() => { + if (this.value) { + let contentName = [] + let contentId = [] + if (this.personneQuery[this.query.db_field_name + 'Name']) { + contentName = this.personneQuery[this.query.db_field_name + 'Name'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + contentName = this.personneQuery[this.query.db_field_name].split(',') + } else { + contentName = [] + } + if (this.personneQuery[this.query.db_field_name + '_id']) { + contentId = this.personneQuery[this.query.db_field_name + '_id'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + contentId = this.personneQuery[this.query.db_field_name].split(',') + } else { + contentId = [] + } + contentId.forEach((res, index) => { + this.dictOptions.push({ + value: res, + title: contentName[index] + }) + this.valueSelect.push(res) + }) + } + }, 600) }, methods: { // checkChange(val, checked, indeterminate) { @@ -314,6 +360,28 @@ this.visible = false this.treeVisible = false }, + onChange(value) { + this.valueSelect = value + console.log(this.valueSelect) + console.log(this.dictOptions) + this.userIds = [] + this.userName = [] + if (this.valueSelect && this.valueSelect.length > 0) { + value.forEach(res => { + this.dictOptions.forEach(val => { + if (res == val.value) { + this.userIds.push(val.value) + this.userName.push(val.title) + } + }) + }) + } + let userIds = JSON.parse(JSON.stringify(this.userIds)) + let userName = JSON.parse(JSON.stringify(this.userName)) + console.log(userIds) + this.$emit('input', userName.join(',')) + this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript) + }, handleSubmit() { // if (this.userIds && this.userIds.length > 0) { if (this.isSingleChoice) { @@ -330,6 +398,19 @@ // userIds = userIds.filter(function(item, index) { // return userIds.indexOf(item) === index // 因为indexOf 只能查找到第一个 // }) + if (!this.isInput) { + this.dictOptions = [] + this.valueSelect = [] + if (userIds && userIds.length > 0) { + userIds.forEach((res, index) => { + this.dictOptions.push({ + title: userName[index], + value: res + }) + this.valueSelect.push(res) + }) + } + } this.$emit('input', userName.join(',')) this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript) this.visible = false @@ -514,11 +595,18 @@ width: 100%; } + .itemModelStand-input { + width: calc(100% - 100px); + display: inline-block; + height: 38px; + } + .button-box { + width: 90px; margin-left: 10px; height: 38px; line-height: 38px; - + float: right; } .drawer-bootom-button { @@ -590,4 +678,18 @@ color: #21c9cc; display: inline-block; } + + .itemOption { + display: inline-block; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + } + + \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 73fae7f9f..86cd81291 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -150,6 +150,7 @@ * {{$t('authorizedUser')}} - + * {{$t('regulatoryContact')}} - + {{$t('Administrativeprivileges')}} - + {{$t('Checkthepermissions')}} - + diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 65b190bd4..4a4469093 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -93,10 +93,11 @@ * {{$t('StudioEngineer')}} - + @@ -108,10 +109,11 @@
{{$t('certifiedEngineer')}}
- + diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 1468194df..8de753c3c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -176,8 +176,9 @@ {{$t('regulatoryEngineer')}} - + {{$t('engineeringInterfacePerson')}} - + @@ -36,6 +37,7 @@ From bb4de00f0093b013d04a9d28f210ac0a691f48f4 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 12 Oct 2022 13:40:05 +0800 Subject: [PATCH 06/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/documentDataComparison.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 4d0b38763..f4d911099 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -91,7 +91,9 @@
- +
{{$t('comparativeComments')}} @@ -99,7 +101,7 @@ + :rows="3"/>
@@ -536,7 +538,7 @@ .detail-content-left { width: 50%; float: left; - height: 620px; + height: calc(100vh - 210px); border-right: 2px #EFF1F3 solid; padding: 24px 32px; box-sizing: border-box; @@ -545,7 +547,7 @@ .detail-content-right { width: 50%; - height: 620px; + height: calc(100vh - 210px); float: left; padding: 24px 32px; box-sizing: border-box; @@ -593,6 +595,7 @@ .Remarks { margin-top: 20px; width: 50%; + display: inline-block; padding: 0 32px; box-sizing: border-box; } @@ -602,7 +605,8 @@ } .submit-button { - width: 100%; + display: inline-block; + width: 50%; margin-top: 20px; text-align: right; padding: 0 32px; From ae7a9c7a623c5fa299ed988be205c274981afda9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 12 Oct 2022 16:53:14 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/problemKnowledgeBaseAdd.vue | 21 +++-- .../components/problemKnowledgeBaseList.vue | 55 +++++++++---- .../problemKnowledgeBaseListView.vue | 81 ++++++++++++++++--- .../problemKnowledgeBaseRelease.vue | 26 ++++-- .../components/problemKnowledgeBaseList.vue | 3 +- .../components/problemKnowledgeBase.vue | 3 +- .../searchCenter/components/whole.vue | 3 +- 9 files changed, 153 insertions(+), 41 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 641254c9d..ce00fa078 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1219,6 +1219,7 @@ module.exports = { documentNumber: 'Document Number', documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', + addStandardInformation:'Add standard information', thereWhichCannotDeleted: 'There are sub headings under this title, which cannot be deleted', sdt: 'Sdt', dre: 'Dre', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ee36dd5cd..baa065752 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1321,6 +1321,7 @@ module.exports = { documentNumber: '文档编号', documentTitle: '文档标题', bringInDocumentInformation: '带入文档信息', + addStandardInformation:'添加标准信息', thereWhichCannotDeleted: '该标题下存在子标题无法进行删除', sdt: '工程接口人', dre: '填写人', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index c54e8a7dd..abeca523f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -34,9 +34,10 @@ {{$t('problemClassification')}}
- + - {{$t('bringInDocumentInformation')}} + {{$t('addStandardInformation')}}
@@ -356,7 +357,7 @@ document.title = this.$t('problemKnowledgeBase') + this.$t('edit') } else { this.isDisplayIndex = true - this.$nextTick(()=>{ + this.$nextTick(() => { this.myQuillEditor() }) document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') @@ -476,6 +477,11 @@ } else { this.formInline.standNumber = [] } + if (this.formInline.problemType) { + this.formInline.problemType = this.formInline.problemType.split(',') + } else { + this.formInline.problemType = [] + } this.formInline = { ...this.formInline } } else { this.formInline = {} @@ -491,7 +497,7 @@ this.$router.go(-1) }, onEditorReady(quill) { - if (this.formInlineOne.content){ + if (this.formInlineOne.content) { document.getElementsByClassName('ql-editor')[0].innerHTML = this.formInlineOne.content } }, @@ -600,9 +606,12 @@ if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) // if (formInline.standNumber && formInline.standNumber.length > 0) { - if (formInline.standNumber instanceof Array){ + if (formInline.standNumber instanceof Array) { formInline.standNumber = formInline.standNumber.join(',') } + if (formInline.problemType instanceof Array) { + formInline.problemType = formInline.problemType.join(',') + } // } this.loading = true this.confirmLoading = true diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 1c1ef45bd..78057a352 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -65,16 +65,16 @@ {{val}} -
-
- +
+
- {{val.fileName}} + {{val.fileName}}
@@ -85,9 +85,13 @@ {{item.createBy}}
-
+
- {{item.problemTypeName}} + {{item.standNumber}} +
+
+ + {{item.targetMarket_dicText}}
@@ -170,6 +174,7 @@ import SelectedBy from '@/components/SelectedBy/index' import problemKnowledgeBaseListView from './problemKnowledgeBaseListView' import { mapGetters } from 'vuex' + import { Base64 } from 'js-base64' export default { name: 'problemKnowledgeBaseList', @@ -193,6 +198,7 @@ queryForm: {}, tagList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', + downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', pageNo: 1, url: { getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' @@ -255,6 +261,26 @@ this.getList() }) }, + fileClick(fileQuery) { + let fileName = fileQuery.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + if (fileSuffix == '.pdf') { + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + } + }, problemKnowledgeBase() { this.pageNo = 1 this.isTrue = true @@ -309,7 +335,8 @@ }, getText(str) { let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 - return words.replace(/\s/g, '') //这里是去除空格 + //.replace(/\s/g, '') //这里是去除空格 + return words }, getList() { let selectedTags = JSON.parse(JSON.stringify(this.selectedTags)) @@ -629,7 +656,7 @@ background: #DBF2F3; border-radius: 3px; margin-left: 6px; - max-width: 120px; + max-width: 140px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -662,22 +689,22 @@ margin-top: 10px; .content-box-content-botton-text { - max-width: 198px; + /*max-width: 198px;*/ height: 32px; display: inline-block; text-align: center; line-height: 32px; - padding: 0 10px; - background: #EFF1F3; + /*background: #EFF1F3;*/ border-radius: 4px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - font-size: 12px; + font-size: 14px; font-weight: 400; color: #040B29; - margin-right: 10px; + margin-right: 20px; cursor: pointer; + text-decoration: underline; } } } @@ -789,7 +816,7 @@ background: #fff; background: rgba(4, 11, 41, 0.06); color: #363C54; - max-width: 150px; + max-width: 280px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 78ad86e43..4c0f51f27 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -33,9 +33,13 @@ {{queryForm.createBy}}
-
- - {{queryForm.problemTypeName}} +
+ + {{queryForm.standNumber}} +
+
+ + {{queryForm.targetMarket_dicText}}
@@ -96,8 +100,16 @@
{{item.commentContent}}
-
- {{$t('answer')}} +
+ + {{$t('answer')}} + + + {{$t('delete')}} +
@@ -109,8 +121,15 @@
{{val.commentContent}}
-
+
+ {{$t('answer')}} + + + {{$t('delete')}} +
@@ -158,6 +177,7 @@ import SelectedBy from '@/components/SelectedBy/index' import { mapGetters } from 'vuex' import { Base64 } from 'js-base64' + import { deleteAction } from '../../../../api/manage' export default { name: 'problemKnowledgeBaseListView', @@ -167,6 +187,8 @@ data() { return { visibleComment: false, + administrators: false, + userInfoQuery: {}, releaseList: [], loading: false, formInline: {}, @@ -205,7 +227,15 @@ } }, mounted() { - + this.administrators = false + this.userInfoQuery = this.userInfo() + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), @@ -229,6 +259,28 @@ downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) } }, + deleteClick(item) { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + let url = '' + if (item.problemKnowledgeBaseId) { + url = '/problemKnowledgeBase/problemKnowledgeBaseCommentEO/deleteBatch' + } else { + url = '/project/problemKnowledgeBaseReplyEO/deleteBatch' + } + deleteAction(url, { ids: item.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.releaseData() + } else { + _this.$message.warning(res.message) + } + }) + } + }) + }, download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, @@ -494,22 +546,22 @@ margin-top: 10px; .content-box-content-botton-text { - max-width: 200px; + /*max-width: 200px;*/ /*min-width: 120px;*/ height: 32px; display: inline-block; text-align: center; line-height: 32px; - padding: 0 10px; - background: #EFF1F3; + /*padding: 0 10px;*/ + /*background: #EFF1F3;*/ border-radius: 4px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - font-size: 12px; + font-size: 14px; font-weight: 400; color: #040B29; - margin-right: 10px; + margin-right: 20px; cursor: pointer; .file-text { @@ -517,6 +569,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + text-decoration: underline; display: inline-block; margin-right: 6px; cursor: pointer; @@ -632,6 +685,10 @@ margin-top: 6px; } + .answer-text-index { + width: 100%; + } + .answer-text { display: inline-block; padding: 3px 14px; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 67a491e01..cc029a5c3 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -3,9 +3,9 @@
- - - + + + {{$t('managePublishing')}}
@@ -42,8 +42,10 @@ {{item.contentOne}}
- {{$t('edit')}} - {{$t('delete')}} + {{$t('edit')}} + {{$t('delete')}}
@@ -85,8 +87,10 @@ pageSize: 10, searchStr: '', loading: false, + administrators: false, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, + userInfoQuery: {}, url: { getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page', deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseEO/deleteBatch' @@ -96,6 +100,15 @@ mounted() { this.getList() document.title = this.$t('managePublishing') + this.administrators = false + this.userInfoQuery = this.userInfo() + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), @@ -119,7 +132,8 @@ }, getText(str) { let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 - return words.replace(/\s/g, '') //这里是去除空格 + //.replace(/\s/g, '') //这里是去除空格 + return words }, getList() { let query = { diff --git a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue index 8d9566e23..bdb7e2f03 100644 --- a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue @@ -205,7 +205,8 @@ }, getText(str) { let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 - return words.replace(/\s/g, '') //这里是去除空格 + //.replace(/\s/g, '') //这里是去除空格 + return words }, getList() { let query = { diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index ea2577782..6bdb523d5 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -222,7 +222,8 @@ }, getText(str) { let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 - return words.replace(/\s/g, '') //这里是去除空格 + //.replace(/\s/g, '') //这里是去除空格 + return words }, getParagraphInfoList() { let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam)) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 4b5525064..0b2597018 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -201,7 +201,8 @@ }, getText(str) { let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 - return words.replace(/\s/g, '') //这里是去除空格 + //.replace(/\s/g, '') //这里是去除空格 + return words }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) From 0ae4b1e3a15ad3a0538e7444c047aab1a7e91497 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 12 Oct 2022 17:03:07 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 848032435..099911f9e 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 @@ -1040,7 +1040,7 @@ public class WordUtil { 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()+","); + sb.append(loginUserList.get(0).getRealname()+","); } } if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ From 5bf92e1769c0bba7023afb5a851e30513dc9a8f6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 12 Oct 2022 17:14:19 +0800 Subject: [PATCH 09/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog/ParameterTemplateAdd.vue | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index a4151bd78..bcec63bc8 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -13,6 +13,7 @@ @@ -24,7 +25,7 @@ -
+
{{$t('zoneOfApplication')}} @@ -34,9 +35,9 @@ - - - + + +
- - - - - - - - + + + + + + + +
@@ -65,16 +66,17 @@
- - - - - + + + + + {{ $t('query') }} @@ -92,7 +94,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 600,y:300}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> @@ -376,13 +378,14 @@ .drawer-bootom-button { display: flex; - justify-content: center; + justify-content: flex-end; } .Required { color: red; margin-right: 4px; } + .box-title-text { line-height: 1.4; display: flex; @@ -390,7 +393,7 @@ } .title-text { - width: 114px; + width: 85px; text-align: right; display: inline-block; font-weight: 500; @@ -410,7 +413,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 101px); display: inline-block; margin-top: 2px; height: 40px; @@ -466,6 +469,10 @@ line-height: 6px; color: #fff; } + + .box-button { + height: 38px; + } \ No newline at end of file From eedd983345379bfbc9c2115caf9754db82d68450 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 12 Oct 2022 18:11:53 +0800 Subject: [PATCH 10/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 96 ++++++++++++++++++- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index a34563275..12fc10c4d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -881,11 +881,30 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, List reportTitleOneList, From 772901c74a4fefb373324b7b0a230a3a9465f507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 13 Oct 2022 10:36:26 +0800 Subject: [PATCH 11/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 124 +++++++++--------- jero-web/src/common/lang/zh-cn.js | 6 + .../components/problemKnowledgeBaseAdd.vue | 4 +- .../components/comparisonResults.vue | 2 +- .../components/documentDataComparison.vue | 2 +- .../documentComparison/index.vue | 16 +-- .../components/problemKnowledgeBase.vue | 4 +- .../documentTools/searchCenter/index.vue | 2 +- .../externalReports/components/addModel.vue | 2 +- jero-web/src/views/externalReports/index.vue | 8 +- 10 files changed, 91 insertions(+), 79 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 641254c9d..76cc26cfc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -193,8 +193,13 @@ module.exports = { OperationLog: 'Operation Log', SearchLog: 'Search Log', enterSearchKeyword: 'Please enter a search keyword', + enterSearchContent:'Please enter Search Content', + enterStandard:'Please enter Number', + entertitle:'Please enter Title', OperationType: 'Operation Type', selectOperationType: 'Please select Operation type', + selectProblemClassification:'Please select Classification', + selectMarket:'Please select Market', RequestMethod: 'Request Method', RequestParameters: 'Request Parameters', logManagementPage: 'This is the log management page', @@ -386,7 +391,7 @@ module.exports = { DocumentComparison: 'Doc Comparison', KnowledgeDatabase: 'Q&A Knowledge', StandardDetails: 'Standard Details', - whole: 'Whole', + whole: 'All', DocumentLibrary: 'Document Library', GeneralExportInformation: 'General export information', CustomizeExportInformation: 'Customize export information', @@ -500,7 +505,7 @@ module.exports = { ProcessName: 'Process Name', ProcessType: 'Process Type', AddProcess: 'Add Process', - RelatedItems: 'Relevant Project', + RelatedItems: 'Project', Sponsor: 'Creator', CurrentProcessor: 'Current Processor', LastProcessor: 'Last Processor', @@ -721,7 +726,7 @@ module.exports = { directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', - enclosure: 'Enclosure', + enclosure: 'Attachments', // 认证 // 认证状态 timeOperation: 'You have permission to operate this button.', @@ -916,7 +921,7 @@ module.exports = { deliveryHistory: 'Delivery History', projectDeliveryRequirements: 'Project delivery requirements', personLiableConfirm: 'PersonLiable Confirm', - complianceResults: 'Compliance Results', + complianceResults: 'Feedback', noData: 'No Data', confirmOperation: 'Confirm Operation', sponsorReview: 'Sponsor Review', @@ -983,25 +988,25 @@ module.exports = { taskConfirmationResponsiblePerson: 'Task confirmation of responsible person', or: 'or', warningTime: 'Warning Time', - RegulationMonthlyManagement: 'Regulation Monthly Management', - RegulationMonthlyFill: 'Regulation Monthly Fill', - RegulationMonthlyName: 'Regulation monthly name', - monthlyLanguage: 'Monthly Language', + RegulationMonthlyManagement: 'Manage Monthly Report', + RegulationMonthlyFill: 'Fill in Monthly Report', + RegulationMonthlyName: 'Report Name', + monthlyLanguage: 'Language', releaseStatus: 'Release Status', uploadedBy: 'Uploaded By', - uploadMonthly: 'Upload Monthly', - chapterContents: 'Chapter Contents', + uploadMonthly: 'Upload Report', + chapterContents: 'Chapter', chineseTitle: 'Chinese Title', englishTitle: 'English Title', - regulatoryContact: 'Regulatory Contact', + regulatoryContact: 'Reg. Contact', exportStatus: 'Export Status', - monthlyTitleTemplate: 'Monthly Title Template', - monthlyIntegrationAndExport: 'Monthly integration and export', + monthlyTitleTemplate: 'Title Template', + monthlyIntegrationAndExport: 'Export Report', addContent: 'Add Content', editContent: 'Edit Content', viewContent: 'View Content', - fillInTheMonth: 'Fill in the month', - monthSelection: 'Month Selection', + fillInTheMonth: 'Filled in (Month)', + monthSelection: 'Select Month', bringInStandardInformation: 'Bring in standard Information', contentTemplate: 'Content Template', moveUp: 'Move Up', @@ -1009,32 +1014,32 @@ module.exports = { vehicleType: 'Vehicle Type', usage: 'Usage', implementationModel: 'Implementation Model', - primaryCoverageCn: 'Primary Coverage (Cn)', - primaryCoverageEn: 'Primary Coverage (En)', + primaryCoverageCn: 'Description (Cn)', + primaryCoverageEn: 'Description (En)', workProgressCn: 'NIO Work Progress (Cn)', workProgressEn: 'NIO Work Progress (En)', - initiatingProcess: 'Initiating Process', + initiatingProcess: 'Initiate Process', collectResults: 'Collect Results', dateOfInitiation: 'Date Of Initiation', - closingDate: 'Closing Date', + closingDate: 'Due Date', viewProcess: 'View Process', evaluationResults: 'Evaluation Results', Assessor: 'Assessor', collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions', collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process', - feedbackInformation: 'Feedback Information', - relevantSections: 'Relevant Sections', - questionsSuggestions: 'Questions Or Suggestions', + feedbackInformation: 'Feedback', + relevantSections: 'Chapter', + questionsSuggestions: 'Questions/Suggestions', reason: 'Reason', proposedTime: 'Proposed Time', feedbackPoint: 'Feedback Point', link: 'Link', planNoChinese: 'Plan No.', - standardNameCn: 'Standard Name Cn', - standardNameEn: 'Standard Name En', - deadlineForComments: 'Deadline for comments', + standardNameCn: 'Standard Title Cn', + standardNameEn: 'Standard Title En', + deadlineForComments: 'Deadline for Comments', standardNo: 'Standard No', - implemenDate: 'Implementation Date', + implemenDate: 'Effective Date', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest Update Time', @@ -1115,7 +1120,7 @@ module.exports = { PreHomoNotification: 'Pre-Homo Notification', ValidationComplianceNotification: 'Validation Compliance Notification', RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification', - evaluationMethod: 'Evaluation method', + evaluationMethod: 'Check Method', uploadRelevantMaterials: 'Upload relevant materials', processBackground: 'Process Background', selectedStandard: 'Selected Standard', @@ -1123,13 +1128,13 @@ module.exports = { pleaseSelectStandardFirst: 'Please select a standard first', RelevantMaterials: 'RelevantMaterials', evaluatorFeedback: 'Evaluator Feedback', - nameTechnicalDocument: 'Name of technical document', + nameTechnicalDocument: 'Technical Document', chapter: 'Chapter', problemDescription: 'Problem Description', filingExternalOpinions: 'Filing of external opinions', regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', initiateProcessForCurrentStandard: 'Initiate process for current standard', - engineerFeedbackResults: 'Engineer feedback results', + engineerFeedbackResults: 'Engineer Feedback', fileExport: 'File Export', feedbackTime: 'Feedback Time', regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process', @@ -1147,29 +1152,30 @@ module.exports = { releaseSituation: 'Release situation', comparisonResults: 'Comparison results', Published: 'Published', - initiateComparison: 'Initiate comparison', + initiateComparison: 'Initiate Comparison', translationLanguage: 'Translation language', translationResults: 'Translation results', conversionTime: 'Conversion time', category: 'Category', RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results', ViewConformanceResults: 'View Conformance Results', - CommentsCollectionResultsForReference: 'Comments Collection Results For', - TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For', + CommentsCollectionResultsForReference: 'Opinion Collection Results', + TechnicalEvaluationResultsForReference: 'Technical Assessment Results', ComplianceConfirmationRecord: 'Compliance Confirmation Record', complianceConfirmation: 'Compliance Confirmation', noComparisonDocumentSelected: 'No comparison document selected', RemarkInfo: 'Remarks Info', initiateDocumentComparison: 'Initiate Document Comparison', comparativeComments: 'Comparative Comments', - viewTheComparisonResults: 'View The Comparison Results', - addFullTextComment: 'Add Full Text Comment', - turnOffAutomaticMatching: 'Turn Off Automatic Matching', - Deriveconformanceresults: 'Derive Conformance Results', + viewTheComparisonResults: 'View Results', + addFullTextComment: 'Full Text Comment', + turnOffAutomaticMatching: 'Turn Off Auto Match', + Deriveconformanceresults: 'Export Results', Regulatorycompliancekanban: 'Regulatory Compliance Kanban', exportComparisonReport: 'Export Comparison Report', comparisonDifferenceComment: 'Comparison Difference Comment', - fullTextComments: 'Full text comments', + fullTextComments: 'Full Text Comment', + pleaseEnterfullTextComments:'Please enter Full Text Comment', fileDeclaration: 'File Declaration', FileForDetails: 'File For Details', Converting: 'Converting', @@ -1177,7 +1183,7 @@ module.exports = { convertFailed: 'Convert Failed', standardData: 'Standard Data', Theorganization: 'The Organization', - Addingfolder: 'Adding a folder', + Addingfolder: 'Create New Folder', Addingsubfolders: 'Adding Subfolders', Editfolder: 'Edit Folder', Deletefolders: 'Delete Folders', @@ -1188,8 +1194,8 @@ module.exports = { Openpersonnel: 'Open Personnel', originalText: 'Original Text', translatedText: 'Translated Text', - Administrativeprivileges: 'Administrativ Pprivileges', - Checkthepermissions: 'Check The Permissions', + Administrativeprivileges: 'Administrative Permissions', + Checkthepermissions: 'Read Permissions', onlyFilesUploaded: 'Only.Docx,.Doc files can be uploaded', selectDirectorylocation: 'Please select the directory location to add the folder', Fileuploaded: 'File uploaded, please wait', @@ -1199,10 +1205,10 @@ module.exports = { Parametercollection: 'Parameter Collection', Collectlist: 'Colle Ctlist', Statisticalmodels: 'Statisti Calmodels', - Inthecollection: 'In the collection', - Notatthe: 'Not at the', + Inthecollection: 'During collection', + Notatthe: 'Not started', Thepercentage: 'The Percentage', - problemKnowledgeBase: 'Problem Knowledge Base', + problemKnowledgeBase: 'Q&A Knowledge', recentHotSpots: 'Recent Hot Spots', disseminationMaterials: 'Dissemination Materials', informationSafety: 'Information Safety', @@ -1211,10 +1217,10 @@ module.exports = { productHighlights: 'Product Highlights', financialReimbursement: 'Financial Reimbursement', classificationMaintenance: 'Classification Maintenance', - managePublishing: 'Manage Publishing', - displayPermission: 'Display permission', + managePublishing: 'Release Management', + displayPermission: 'Display Permission', authorizedUser: 'Authorized user', - problemClassification: 'Problem classification', + problemClassification: 'Problem Classification', market: 'Market', documentNumber: 'Document Number', documentTitle: 'Document Title', @@ -1224,23 +1230,23 @@ module.exports = { dre: 'Dre', applicableInstructionsMarketList: 'Applicable instructions of market list', pleaseSelectTheDataCompared: 'Please select the data to be compared', - problemLabel: 'Problem label', + problemLabel: 'Topic Tag', personCharge: 'Person in charge', - addLabel: 'Add Label', + addLabel: 'Add Tag', editLabel: 'Edit Label', - applicableMarket: 'Applicable market', - templateMaintenance: 'Template maintenance', + applicableMarket: 'Applicable Market', + templateMaintenance: 'Template Maintenance', associatedWebsite: 'Associated website', dropDownOptions: 'Drop down options', dropDownOptionMaintenance: 'Drop down option maintenance', - displayInformation: 'Display information', - addComparison: 'Add comparison', + displayInformation: 'Display Information', + addComparison: 'Add Comparison', showOrNot: 'Show or not', comparisonMarket: 'Comparison Market', share: 'Share', simplifiedChinese:'Simplified Chinese', uploadOnly:'Upload only', - turnOnAutoMatch:'Turn on auto match', + turnOnAutoMatch:'Turn On Auto Match', Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', punctuationmark:'You can only enter English punctuation marks except the # sign and commas', @@ -1266,8 +1272,8 @@ module.exports = { onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed', thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', industryInformationDynamicTemplate:'Industry information dynamic template', - relatedFields:'Related fields', - relatedFieldsEn:'Related fields (English)', + relatedFields:'Relaevant Area', + relatedFieldsEn:'Relaevant Area (English)', source:'Source', sourceEn:'Source (English)', onlyone:'Only one merge delimiter can be entered', @@ -1307,9 +1313,9 @@ module.exports = { inRecentYear2:'In recent 2 year', selectAll:'Select All', importLocalDisassemblyOrder:'Import local disassembly order', - notExport:'Not export', - hasBeenExport:'Has been export', - firstLevelDirectory:'First level directory', + notExport:'Not exported', + hasBeenExport:'Exported', + firstLevelDirectory:'Primary Directory', deselectAll:'Deselect All', classification:'Classification', consistentAssessment:'Consistent', @@ -1318,6 +1324,6 @@ module.exports = { viewAll:'View All', endProcess:'End Process', thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data', - secondaryDirectory:'Secondary directory', + secondaryDirectory:'Secondary Directory', OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected', } \ 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 ee36dd5cd..653c98b71 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -195,8 +195,13 @@ module.exports = { OperationLog: '操作日志', SearchLog: '搜索日志', enterSearchKeyword: '请输入搜索关键词', + enterSearchContent:'请输入搜索内容', + enterStandard:'请输入编号', + enterTitle:'请输入标题', OperationType: '操作类型', selectOperationType: '请选择操作类型', + selectProblemClassification:'请选择问题分类', + selectMarket:'请选择市场', RequestMethod: '请求方法', RequestParameters: '请求参数', logManagementPage: '这是日志管理页面', @@ -1173,6 +1178,7 @@ module.exports = { exportComparisonReport: '导出对比报告', comparisonDifferenceComment: '对比差异评论', fullTextComments: '全文评论', + pleaseEnterfullTextComments:'请输入全文评论', fileDeclaration: '文件说明', FileForDetails: '文件详情', Converting: '转换中', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 0fc3fa9f4..f4ac484dd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -32,10 +32,10 @@
* {{$t('problemClassification')}} + :title="$t('classification')">{{$t('classification')}}
- {{$t('fullTextComments')}}
- diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 4d0b38763..fb262c4bd 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -135,7 +135,7 @@ {{$t('fullTextComments')}}
- diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 39fe0ee88..85120eb4c 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -8,7 +8,7 @@
{{$t('standard')}}
-
@@ -17,7 +17,7 @@
{{$t('title')}}
-
@@ -135,7 +135,7 @@ selectedRowKeysRecord: [], columns: [ { - title: this.$t('standard') + 1, + title: this.$t('standard') + ' 1', align: 'center', dataIndex: 'serialNumberLeft', width: 170, @@ -143,7 +143,7 @@ scopedSlots: { customRender: 'serialNumberLeft' } }, { - title: this.$t('title') + 1, + title: this.$t('title') + ' 1', align: 'center', dataIndex: 'titleLeft', width: 170, @@ -151,7 +151,7 @@ scopedSlots: { customRender: 'serialNumberLeft' } }, { - title: this.$t('TextStatus') + 1, + title: this.$t('TextStatus') + ' 1', align: 'center', width: 200, ellipsis: true, @@ -166,7 +166,7 @@ // scopedSlots: { customRender: 'fileNameLeft' } // }, { - title: this.$t('standard') + 2, + title: this.$t('standard') + ' 2', align: 'center', dataIndex: 'serialNumberRight', ellipsis: true, @@ -174,7 +174,7 @@ width: 170 }, { - title: this.$t('title') + 2, + title: this.$t('title') + ' 2', align: 'center', dataIndex: 'titleRight', scopedSlots: { customRender: 'serialNumberRight' }, @@ -182,7 +182,7 @@ width: 170 }, { - title: this.$t('TextStatus') + 2, + title: this.$t('TextStatus') + ' 2', align: 'center', width: 200, ellipsis: true, diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index ea2577782..2d203eedc 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -5,7 +5,7 @@
{{$t('problemClassification')}} - {{$t('market')}}
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 8270a0c4b..eb06f6f1e 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -26,7 +26,7 @@ v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase') || active === $t('monthlyReportRegulations')" class="inputSearch" - :placeholder="$t('pleaseEnter')+$t('searchContent')" + :placeholder="$t('enterSearchContent')" > * {{$t('file')}} + :title="$t('fileName')">{{$t('fileName')}}
-
- {{ $t('file') }} +
+ {{ $t('fileName') }}
-
@@ -357,7 +357,7 @@ export default { ], columns: [ { - title: this.$t('file'), + title: this.$t('fileName'), align: 'center', dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, From a4c6f9d193b2490a875463682cada6527265be22 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 13 Oct 2022 11:03:10 +0800 Subject: [PATCH 12/54] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/comparisonResults.vue | 3 ++- .../documentComparison/index.vue | 19 ++++++++++---- .../documentTranslation/index.vue | 25 ++++++++++++++----- .../views/regulatoryEarlyWarning/index.vue | 7 ++++-- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 1456757d9..8e0ed1044 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -60,7 +60,7 @@ {{resultData.fileNameRight}}
-
+
{{$t('comparisonDifferenceComment')}}
@@ -494,6 +494,7 @@ .operator-text-text { cursor: pointer; margin-right: 53px; + max-width: 138px; font-size: 14px; font-weight: 400; color: #040B29; diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 85120eb4c..57657ca5e 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -42,11 +42,11 @@
-
+
{{$t('initiateComparison')}}
-
+
{{$t('BatchDelete')}}
@@ -67,15 +67,15 @@ {{$t('comparisonResults')}} {{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} @@ -132,6 +132,7 @@ pageNo: 1, queryParam: {}, userInfoQuery: {}, + administrators:false, selectedRowKeysRecord: [], columns: [ { @@ -233,6 +234,14 @@ this.queryParam = { ...this.queryParam } } this.userInfoQuery = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } this.getList() }, methods: { diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 36096b058..d12d90c04 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -59,15 +59,15 @@
-
+
{{$t('upload1')}}
-
+
{{$t('RetrieveFiles')}}
-
+
{{$t('BatchDelete')}}
@@ -86,18 +86,22 @@ > - {{$t('view')}} + {{$t('view')}} {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}} {{$t('download')}} {{$t('delete')}} @@ -158,6 +162,7 @@ queryParam: {}, userInfoQuery: {}, selectedRowKeysRecord: [], + administrators:false, columns: [ { title: this.$t('standard'), @@ -233,6 +238,14 @@ } this.getList() this.userInfoQuery = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index dbb45982a..1d39b7282 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -8,11 +8,14 @@ :url="url"/>
-
+
{{$t('Push')}}
-
+
{{$t('export')}}
From fb00274ebf296c50fb09c1d379553908d9a51542 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 13 Oct 2022 11:10:51 +0800 Subject: [PATCH 13/54] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 6 ++ .../system/service/ISysUserService.java | 6 ++ .../service/impl/SysUserServiceImpl.java | 28 ++++++++++ .../entity/ProblemKnowledgeBaseEO.java | 8 ++- .../ProblemKnowledgeBaseEOServiceImpl.java | 55 ++++++++++++------- 5 files changed, 83 insertions(+), 20 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index f8c534ad3..0468e8dc6 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1179,4 +1179,10 @@ update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6 -- 配置表，增加问题知识库预览图片配置 2022-09-27 已同步生产环境 INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL'); +--问题知识库，增加字段 发布状态 2022-10-13 未同步生产环境 +ALTER TABLE `laws_weilai`.`problem_knowledge_base` + ADD COLUMN `release_status` varchar(50) NULL COMMENT '发布状态' AFTER `release_time`; + +--处理问题知识库数据，发布人，发布时间，发布状态数据sql 2022-10-13 未同步生产环境 +update problem_knowledge_base pkd set pkd.release_status = 'Have released',pkd.release_time = pkd.create_time,pkd.release_user_id = (select su.id from sys_user su where su.username = pkd.create_by) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index b1ca1cf74..b091fc0c4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -270,4 +270,10 @@ public interface ISysUserService extends IService { * @return */ List queryUserRoleListInfoByUserId(String userId); + + /** + * 验证当前登录用户是否是超级管理员。 + * @return + */ + boolean isAdministrator(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 3f4c2adcb..71dac6e67 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -17,6 +17,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; import com.jero.modules.system.enums.PPSyncEnum; +import com.jero.modules.system.enums.RoleEnum; import com.jero.modules.system.mapper.*; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysUserService; @@ -24,6 +25,7 @@ import com.jero.modules.system.vo.SysUserDepVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -586,4 +588,30 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + /** + * 验证当前登录用户是否是超级管理员 + * @return + */ + @Override + public boolean isAdministrator() { + boolean result = false; + RoleEnum administrator = RoleEnum.MANAGER_ID; + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 + if(CollectionUtils.isNotEmpty(userRoleList)){ + List userRoles = userRoleList.stream().filter(userRole -> { + boolean flag = false; + if(StringUtils.equals(userRole.getRoleId(),administrator.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(userRoles)){ + result = true; + } + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index 870abb198..81caaff2c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -1,6 +1,7 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -156,7 +157,7 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**发布日期*/ @Excel(name = "发布日期", width = 15) @ApiModelProperty(value = "发布日期") - private java.lang.String releaseTime; + private Date releaseTime; /**点赞总数量*/ @TableField(exist = false) @@ -195,4 +196,9 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**附件展示数组*/ @TableField(exist = false) private List accessoryFileNameList; + + /**发布状态*/ + @Excel(name = "发布状态", width = 15) + @ApiModelProperty(value = "发布状态") + private String releaseStatus; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index a1e1f7bd9..d6f4bfcac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -24,6 +24,7 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.problemKnowledgeBase.entity.*; import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum; +import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.*; @@ -114,17 +115,19 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl queryWrapper,ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { /** - * 查询权限 - * 公开：所有人都可以看到。 - * 私密：只有配置了的权限用户可以看到。 + * 2022-10-13增加权限，超级管理员可以看到所有的问题知识库数据。 */ - LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); - userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId()); - List problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + boolean administrator = this.sysUserService.isAdministrator(); + if(!administrator){ + /** + * 查询权限 + * 公开：所有人都可以看到。 + * 私密：只有配置了的权限用户可以看到。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId()); + List problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); - List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); - queryWrapper.lambda().and(query -> { - query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()); + queryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()); if(CollectionUtils.isNotEmpty(problemKnowledgeBaseIdList)){ query.or(o -> { o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); }); } - }); + }); + } String searchStr = problemKnowledgeBaseEO.getSearchStr(); if(StringUtils.isNotEmpty(searchStr)){ From c0d4491e87b24a6555763fa26522402f696cbc8a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 13 Oct 2022 11:14:56 +0800 Subject: [PATCH 14/54] update --- .../jero/modules/system/enums/RoleEnum.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java new file mode 100644 index 000000000..5e344c977 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java @@ -0,0 +1,62 @@ +package com.jero.modules.system.enums; + +public enum RoleEnum { + ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2), + MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3), + COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4), + ; + + String name; + String enName; + String value; + String id; + Integer order; + + RoleEnum(String name, String enName, String value, String id, Integer order) { + this.name = name; + this.enName = enName; + this.value = value; + this.id = id; + this.order = order; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } +} From 6a9157d913e03ab5d67b40578fa625f85b0dba66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 13 Oct 2022 11:42:39 +0800 Subject: [PATCH 15/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ddd833f50..93cd90b7e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -198,7 +198,7 @@ module.exports = { entertitle:'Please enter Title', OperationType: 'Operation Type', selectOperationType: 'Please select Operation type', - selectProblemClassification:'Please select Classification', + selectProblemClassification:'Please select Problem Classification', selectMarket:'Please select Market', RequestMethod: 'Request Method', RequestParameters: 'Request Parameters', From 00e513b32a2c170b33fa7eb6994da1e2ef1ea171 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 13 Oct 2022 11:54:49 +0800 Subject: [PATCH 16/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 12 ++- .../components/problemKnowledgeBaseList.vue | 3 +- .../problemKnowledgeBaseRelease.vue | 80 ++++++++++++++----- 3 files changed, 74 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index abeca523f..487daf815 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -179,7 +179,10 @@
- {{$t('submit')}} + + {{$t('tempSave')}} + + {{$t('release')}}
@@ -601,7 +604,10 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, - submit() { + tempSaveClick(){ + + }, + submit(releaseStatus) { this.$refs.ruleForm.validate(valid => { if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) @@ -633,6 +639,7 @@ }) }) } + formInline.releaseStatus = releaseStatus Action(url, formInline).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) @@ -784,6 +791,7 @@ .box-button { height: 38px; margin-top: 4px; + margin-left: 10px; } .box-button-index { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 78057a352..daab20b60 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -344,7 +344,8 @@ pageNo: this.pageNo, pageSize: this.pageSize, searchStr: this.searchStr, - problemTypes: selectedTags.join(',') + problemTypes: selectedTags.join(','), + releaseStatus:'Have released' } this.loading = true getAction(this.url.getInfoList, query).then((res) => { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index cc029a5c3..16bc05889 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -12,16 +12,40 @@
- -
-
- {{$t('searchContent')}} + + + +
+
+ {{$t('searchContent')}} +
+ +
+ + +
+
+ {{$t('releaseStatus')}} +
+ + + + {{ item.name}} + + + +
+ +
+ {{$t('query')}} + {{$t('reset')}} +
- - {{$t('query')}} - {{$t('reset')}} -
+
@@ -41,6 +65,9 @@
{{item.contentOne}}
+
+ {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}} +
{{$t('edit')}} @@ -85,7 +112,17 @@ conList: [], total: 0, pageSize: 10, - searchStr: '', + queryParam: {}, + releaseStatusList: [ + { + name: this.$t('draft'), + value: 'Draft' + }, + { + name: this.$t('HaveReleased'), + value: 'Have released' + } + ], loading: false, administrators: false, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', @@ -126,7 +163,7 @@ this.getList() }, ResetSearch() { - this.searchStr = '' + this.queryParam = {} this.pageNo = 1 this.getList() }, @@ -140,7 +177,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, createBy: this.userInfo().username, - searchStr: this.searchStr + ...this.queryParam } this.loading = true getAction(this.url.getInfoList, query).then((res) => { @@ -285,11 +322,21 @@ .text-text-right { padding: 19px 19px; - width: calc(100% - 180px); + width: calc(100% - 300px); box-sizing: border-box; /*margin-left: 38px;*/ } + .text-text-right-text-One { + width: 120px; + height: 100%; + text-align: center; + position: absolute; + right: 180px; + top: 50%; + transform: translate-Y(-50%); + } + .text-text-right-text { width: 180px; height: 100%; @@ -365,16 +412,13 @@ .search-detail-wrap { width: 100%; - margin: 0 auto; + margin-bottom: 16px; } .box-title-text { line-height: 1.4; display: flex; align-items: center; - margin-bottom: 10px; - text-align: center; - justify-content: center; } .title-text { @@ -394,7 +438,7 @@ .box-input { /*min-width: 200px;*/ display: inline-block; - width: 50%; + width: 100%; height: 38px; margin-top: 2px; margin-right: 16px; From 6147be50b5ffdd32b5bce10b9ccfdbb7f8d6d0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 13 Oct 2022 11:58:00 +0800 Subject: [PATCH 17/54] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E6=A0=BC=E6=8B=96=E6=8B=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 6e7bf6b0f..78bc0e00e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -11,7 +11,6 @@ :data-source="dataSource" :loading="loading" sticky - :components="components" :columns="columns" :rowClassName="rowClassName" @change="tableOnChange" From 6d2caec19fa4b0229ffe07c5bda1d16b97ef9a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 13 Oct 2022 11:59:48 +0800 Subject: [PATCH 18/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91=E7=9A=84=E5=90=8E=E7=AB=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docTranslation/enums/ReleaseConditionEnum.java | 2 +- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 4 ++-- .../com/jero/modules/report/enums/ExportStateEnum.java | 4 ++-- .../main/java/com/jero/modules/report/util/WordUtil.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java index bba19ad94..1504bb042 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; */ public enum ReleaseConditionEnum { - PUBLISHED("已发布","published","Have published"), + PUBLISHED("已发布","published","Published"), DRAFT("草稿","draft","Draft"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index d6f4bfcac..9ab7619ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -385,9 +385,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl Date: Thu, 13 Oct 2022 13:58:59 +0800 Subject: [PATCH 19/54] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProblemKnowledgeBaseEOController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java index ec31393a5..3ab0e2c98 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -13,6 +13,7 @@ import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOServ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +38,8 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProblemKnowledgeBaseEOController extends JeroController { @Autowired private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; + @Autowired + private ISysUserService sysUserService; /** * 分页列表查询 @@ -54,6 +57,11 @@ public class ProblemKnowledgeBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper,problemKnowledgeBaseEO); queryWrapper.orderByDesc("create_time"); From b63624f76e33dbd4d1c4957e9acc9d2c5da693b7 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 13 Oct 2022 14:28:14 +0800 Subject: [PATCH 20/54] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardList.vue | 4 +- .../components/problemKnowledgeBaseList.vue | 12 +++- .../components/RegulationMonthlyFill.vue | 69 +++++++++++++++---- .../RegulationMonthlyManagement.vue | 17 ++++- 4 files changed, 80 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 228ec1dcb..b0c7bc728 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -36,7 +36,9 @@
-
+
{{$t('managePublishing')}}
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index daab20b60..349bc2805 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -15,7 +15,9 @@
-
{{$t('classificationMaintenance')}} @@ -42,11 +44,15 @@ -
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 0fa66b3aa..2be197f75 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -44,19 +44,27 @@
-
+
{{$t('monthlyTitleTemplate')}}
-
+
{{$t('monthlyIntegrationAndExport')}}
-
+
{{$t('addContent')}}
-
+
{{$t('BatchDelete')}}
@@ -74,10 +82,28 @@ :columns="columns" > - {{$t('copy')}} - {{$t('view')}} - {{$t('edit')}} - {{$t('deleteLib')}} + + {{$t('copy')}} + + + {{$t('view')}} + + + {{$t('edit')}} + + + {{$t('deleteLib')}} +
@@ -103,6 +129,7 @@ import fillTable from './modules/fillTable' import fillAdd from './modules/fillAdd' import moment from 'moment' + import { mapGetters } from 'vuex' export default { name: 'RegulationMonthlyFill', @@ -118,14 +145,14 @@ list: '/report/lawsMonthlyReportWriteEO/page', exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport' }, - exportStatusList:[ + exportStatusList: [ { - value:'2', - name:this.$t('hasBeenExport') + value: '2', + name: this.$t('hasBeenExport') }, { - value:'1', - name:this.$t('notExport') + value: '1', + name: this.$t('notExport') } ], loading: false, @@ -192,15 +219,27 @@ width: 190, scopedSlots: { customRender: 'operation' } } - ] + ], + userData:{}, + administrators:false } }, mounted() { this.queryParam.month = moment(new Date()).format('YYYY-MM') this.getList() + this.userData = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { - copyClick(row){ + ...mapGetters(['userInfo']), + copyClick(row) { let _this = this this.$confirm({ content: _this.$t('ConfirmReplication'), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 09ff3b0f0..a89cbe2cd 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -22,7 +22,7 @@
-
+
{{$t('uploadMonthly')}}
@@ -51,14 +51,16 @@ {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}} {{$t('deleteLib')}} {{$t('download')}} @@ -110,6 +112,7 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', userData: {}, + administrators:false, columns: [ { title: this.$t('RegulationMonthlyName'), @@ -161,6 +164,14 @@ mounted() { this.getList() this.userData = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), From 1bc76b06c9b1280e5f112ae33b8a055168c1f6c2 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 13 Oct 2022 15:01:29 +0800 Subject: [PATCH 21/54] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 2115 +++++++++-------- .../src/views/regulationsKanban/index.vue | 6 +- 2 files changed, 1071 insertions(+), 1050 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index f10dccbfc..0543db04a 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -41,11 +41,11 @@ {{title && title.length > 18?title.slice(0,17)+'...':title}} @@ -82,16 +82,17 @@
{{ $t('uploadTime') }}
- + + class="box-input" + @change="onChange" + style='margin-left: -1px' + v-model="queryParams.time" + :disabled="false"/>
- + @@ -106,18 +107,22 @@
-
+
{{ $t('UploadFile') }}
-
+
{{ $t('BatchDelete') }}
@@ -158,9 +169,9 @@ />
- + - + - -
-
- * - {{$t('Foldername')}} + +
+
+ * + {{$t('Foldername')}} +
+ + +
- - - -
- - + +
@@ -245,10 +256,10 @@ {{$t('Folderorder')}}
- + + :parser="limitNumber"/>
@@ -257,453 +268,453 @@ -
+
-
+
+ + + .split-detail-search-header { + .ant-col-sm-8 { + min-width: 300px; + } - \ No newline at end of file diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 4dd1c1f39..6ec89741c 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -65,7 +65,9 @@
-
+
{{ $t('Deriveconformanceresults') }}
@@ -96,7 +98,7 @@ - {{$t('view')}} + {{$t('view')}}
From 0fc0cb29abc66472e9141b421de522f9cd6ca786 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 13 Oct 2022 15:52:26 +0800 Subject: [PATCH 22/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF=E5=8E=BB=E6=8E=89=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=BD=A6=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/report/util/WordUtil.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) 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 0f2595d22..048c0ee08 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 @@ -454,7 +454,7 @@ public class WordUtil { String applyScope = lawsMonthlyReportWriteEO.getApplyScope();//适用范围 String state = lawsMonthlyReportWriteEO.getState();//状态 String useMethod = lawsMonthlyReportWriteEO.getUseMethod();//用法 - String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型 +// String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型 String newCarImplementTime = lawsMonthlyReportWriteEO.getNewCarImplementTime();//新车型实施日期 String productionCarImplementTime = lawsMonthlyReportWriteEO.getProductionCarImplementTime();//在产车实施日期 String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 @@ -504,7 +504,7 @@ public class WordUtil { String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue()); String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue()); - XWPFTable table = document.createTable(11, 2); + XWPFTable table = document.createTable(10, 2); //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); //固定列宽(英文和数字的时候自动换行) @@ -534,19 +534,19 @@ public class WordUtil { //第5行 setCellThree(table,3, "用法",useMethodName,sysDictItems,DictCodeReportEnum.USEMETHOD.getValue()); //第6行 - setCell(table,4, "实施车型",implementCar); +// setCell(table,4, "实施车型",implementCar); //第7行 - setCell(table,5, "新车型实施日期",newCarImplementTime); + setCell(table,4, "新车型实施日期",newCarImplementTime); //第8行 - setCell(table,6, "在产车实施日期",productionCarImplementTime); + setCell(table,5, "在产车实施日期",productionCarImplementTime); //第9行 - setCell(table,7, "主要内容",contentCn); + setCell(table,6, "主要内容",contentCn); //第10行 - setCell(table,8, "NIO工作进展",workProgressCn); + setCell(table,7, "NIO工作进展",workProgressCn); //第11行 - setCell(table,9, "法规联系人",lawsContact); + setCell(table,8, "法规联系人",lawsContact); //第12行 - setCell(table,10, "链接",link); + setCell(table,9, "链接",link); }else{ //第1行 setCell(table,0, "Related Areas",technologyTerritoryName); @@ -559,19 +559,19 @@ public class WordUtil { //第5行 setCellThree(table,3,"Usage",useMethodName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第6行 - setCell(table,4,"Implementation Model",implementCar); +// setCell(table,4,"Implementation Model",implementCar); //第7行 - setCell(table,5,"New Type Execution Date",newCarImplementTime); + setCell(table,4,"New Type Execution Date",newCarImplementTime); //第8行 - setCell(table,6,"New Vehicle Execution Date",productionCarImplementTime); + setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime); //第9行 - setCell(table,7,"Main Content",contentEn); + setCell(table,6,"Main Content",contentEn); //第10行 - setCell(table,8,"NIO Work Progress",workProgressEn); + setCell(table,7,"NIO Work Progress",workProgressEn); //第11行 - setCell(table,9,"Regulatory Contact",lawsContact); + setCell(table,8,"Regulatory Contact",lawsContact); //第12行 - setCell(table, 10,"Link",link); + setCell(table, 9,"Link",link); } // ctTblLayoutType.setType(STTblLayoutType.FIXED); From 232b8efa286071a0373665950e95bad39ec79470 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 13 Oct 2022 16:20:38 +0800 Subject: [PATCH 23/54] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsOpinionGatherEOController.java | 18 +++++++++++ .../entity/LawsOpinionGatherEO.java | 4 +++ .../impl/LawsOpinionGatherEOServiceImpl.java | 8 +++++ .../LawsTechnologyEvaluationEOController.java | 15 ++++++++++ .../entity/LawsTechnologyEvaluationEO.java | 3 ++ .../ILawsTechnologyEvaluationEOService.java | 3 ++ ...LawsTechnologyEvaluationEOServiceImpl.java | 30 +++++++++++++++++++ 7 files changed, 81 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java index 6eec32d23..69864ff66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -8,13 +8,16 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -37,6 +40,8 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsOpinionGatherEOController extends JeroController { @Autowired private ILawsOpinionGatherEOService lawsOpinionGatherEOService; + @Autowired + private ISysUserService sysUserService; /** * 分页列表查询 @@ -57,6 +62,19 @@ public class LawsOpinionGatherEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap()); queryWrapper.orderByDesc("start_time"); + /** + * 创建查询数据权限，超级管理员可以看到所有的数据，并且能删除，其它用户只能看到自己创建、或自己为评估人的数据。 + */ + boolean administrator = this.sysUserService.isAdministrator(); + if(!administrator){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //如果不是超级管理员，获取自己所有参与过的法规意见收集 + queryWrapper.and(query -> { + query.eq("create_by",currentUser.getUsername()); + query.or().like("evaluator_ids",currentUser.getId()); + }); + } + Page page = new Page(pageNo, pageSize); IPage pageList = lawsOpinionGatherEOService.page(page, queryWrapper); this.lawsOpinionGatherEOService.disposeData(pageList.getRecords(),cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java index 78205d522..91adffa7a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -122,4 +122,8 @@ public class LawsOpinionGatherEO implements Serializable { @ApiModelProperty(value = "评估人ids，多个之间使用英文逗号分隔") private String evaluatorIds; + + /**删除标识 true 可以删除，false，没有权限删除**/ + @TableField(exist = false) + private boolean deleteFlag = false; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 376cc56a3..60217e805 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; @@ -31,6 +32,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.modules.jmreport.common.constant.CommonConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -197,6 +199,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl lawsOpinionGatherEOList,String cut) { if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){ + boolean administrator = this.sysUserService.isAdministrator(); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //树形数据字典 List technologyTerritoryList = sysCategoryService.list(); lawsOpinionGatherEOList.forEach(lawsOpinionGather -> { @@ -211,6 +215,10 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl opinionArchiveFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(lawsOpinionGather.getOpinionArchiveId(), ",")); lawsOpinionGather.setOpinionArchiveFileList(opinionArchiveFileList); } + //如果当前用户是超级管理员，或是这条数据的创建人，给删除权限。 + if(StringUtils.equals(lawsOpinionGather.getCreateBy(),currentUser.getUsername()) || administrator){ + lawsOpinionGather.setDeleteFlag(true); + } }); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index ca025a19e..eb3ec59fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -3,19 +3,26 @@ package com.jero.modules.lawsTechnologyEvaluation.controller; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; +import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -40,6 +47,10 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsTechnologyEvaluationEOController extends JeroController { @Autowired private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService; + @Autowired + private ISysUserService sysUserService; + @Autowired + private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService; /** * 分页列表查询 @@ -60,6 +71,10 @@ public class LawsTechnologyEvaluationEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationEO, req.getParameterMap()); queryWrapper.orderByDesc("start_time"); + boolean administrator = this.sysUserService.isAdministrator(); + if(!administrator){ + this.lawsTechnologyEvaluationEOService.createQueryPermission(queryWrapper,lawsTechnologyEvaluationEO,administrator); + } Page page = new Page(pageNo, pageSize); IPage pageList = lawsTechnologyEvaluationEOService.page(page, queryWrapper); this.lawsTechnologyEvaluationEOService.disposeData(pageList.getRecords(),cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java index 37a7d210f..5cb9f2248 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java @@ -149,4 +149,7 @@ public class LawsTechnologyEvaluationEO implements Serializable { @ApiModelProperty(value = "流程编号") private String prcNum; + /**删除标识 true 可以删除，false，没有权限删除**/ + @TableField(exist = false) + private boolean deleteFlag = false; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index b2bad56ff..83138cd5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -1,6 +1,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; @@ -92,4 +93,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService batchCompleteTask(JSONObject jsonObject); + + void createQueryPermission(QueryWrapper queryWrapper, LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO,boolean administrator); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index ac77d8994..cefc08e86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.exception.JeroBootException; +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; import com.jero.modules.document.enums.FieldTypeEnum; @@ -39,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; +import org.apache.shiro.SecurityUtils; import org.jeecg.modules.jmreport.common.constant.CommonConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -229,6 +231,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl datas, String cut) { if(CollectionUtils.isNotEmpty(datas)){ + boolean administrator = this.sysUserService.isAdministrator(); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List categoryList = sysCategoryService.list(); for (LawsTechnologyEvaluationEO data : datas) { if(StringUtils.isNotEmpty(data.getEvaluationMethods())){ @@ -244,6 +248,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().success("手动结束成功！"); } + @Override + public void createQueryPermission(QueryWrapper queryWrapper, LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO,boolean administrator) { + if(!administrator){ + //如果不是超级管理员，获取自己创建的和所有参与过的法规技术评估数据。 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + QueryWrapper flowDetailQueryWrap = new QueryWrapper<>(); + flowDetailQueryWrap.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getEvaluatorId,currentUser.getId()); + List flowDetailEOList = this.lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailQueryWrap); + if(CollectionUtils.isNotEmpty(flowDetailEOList)){ + List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); + queryWrapper.and(query -> { + query.eq("create_by",currentUser.getUsername()); + query.or(q -> { + for (String lawsTechnologyEvaluationId : lawsTechnologyEvaluationIdList) { + q.or().like("id",lawsTechnologyEvaluationId); + } + }); + }); + } + } + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { From 63f471e7ecb1116c41abf10c95baee142cc27b07 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 13 Oct 2022 18:07:01 +0800 Subject: [PATCH 24/54] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99--=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 25 ++- .../LawsMonthlyReportTitleTemplateEO.java | 9 +- .../ILawsMonthlyReportWriteEOService.java | 9 +- .../LawsMonthlyReportWriteEOServiceImpl.java | 194 +++++++++++++++++- 4 files changed, 225 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java index e4fb26d4e..b47ddcb11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -1,6 +1,7 @@ package com.jero.modules.report.controller; 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.system.base.controller.JeroController; @@ -62,9 +63,29 @@ public class LawsMonthlyReportWriteEOController extends JeroController pageList = lawsMonthlyReportWriteEOService.getPageInfo(lawsMonthlyReportWriteEO, pageNo,pageSize,req); - return Result.OK(pageList); + List listInfo = lawsMonthlyReportWriteEOService.getListInfo(lawsMonthlyReportWriteEO, pageNo, pageSize, req); + Page pages = lawsMonthlyReportWriteEOService.getPages(pageNo, pageSize, listInfo); + return Result.OK(pages); } +// /** +// * 分页列表查询 +// * +// * @param lawsMonthlyReportWriteEO +// * @param pageNo +// * @param pageSize +// * @param req +// * @return +// */ +// @AutoLog(value = "月报填写-分页列表查询") +// @ApiOperation(value="月报填写-分页列表查询", notes="月报填写-分页列表查询") +// @GetMapping(value = "/page") +// public Result queryPageList(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, +// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, +// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, +// HttpServletRequest req) { +// IPage pageList = lawsMonthlyReportWriteEOService.getPageInfo(lawsMonthlyReportWriteEO, pageNo,pageSize,req); +// return Result.OK(pageList); +// } /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index 4a66c3f86..9bd5daf0f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -13,7 +13,6 @@ import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -29,7 +28,7 @@ import java.util.List; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="laws_monthly_report_title_template对象", description="月报标题模板") -public class LawsMonthlyReportTitleTemplateEO implements Serializable { +public class LawsMonthlyReportTitleTemplateEO implements Comparable { private static final long serialVersionUID = 1L; /**主键*/ @@ -84,4 +83,10 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { @TableField(exist = false) private String key; + + @Override + public int compareTo(LawsMonthlyReportTitleTemplateEO o) { + return this.sort-o.sort;//升序 +// return o.id-this.id;//降序 + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java index 2f653b1b2..9bcf996c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -1,6 +1,7 @@ package com.jero.modules.report.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; @@ -72,7 +73,11 @@ public interface ILawsMonthlyReportWriteEOService extends IService getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, +// IPage getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, +// Integer pageNo, +// Integer pageSize, +// HttpServletRequest req); + List getListInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, Integer pageNo, Integer pageSize, HttpServletRequest req); @@ -82,4 +87,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService parameter); + + Page getPages(Integer currentPage, Integer pageSize, List list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 12fc10c4d..0b8f0f108 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -60,8 +60,10 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -288,7 +290,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, + public List getListInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, Integer pageNo, Integer pageSize, HttpServletRequest req) { @@ -300,11 +302,48 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); - Page pageInfo = this.page(page, queryWrapper); +// Page page = new Page(pageNo, pageSize); +// Page pageInfo = this.page(page, queryWrapper); + + + //所有的月报 + List lawsMonthlyReportWriteEOList = this.list(queryWrapper); + //所有月报的一级目录 + List oneMenuIdLIst = lawsMonthlyReportWriteEOList.stream().map(LawsMonthlyReportWriteEO::getMemoriesChapterOne).distinct().collect(Collectors.toList()); + //月报标题模板 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.orderByAsc(LawsMonthlyReportTitleTemplateEO::getSort); + List list = lawsMonthlyReportTitleTemplateEOService.list(wrapperTemp); + //1. 一级目录 + List oneList = list.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + oneList = oneList.stream().filter(e -> oneMenuIdLIst.contains(e.getId())).collect(Collectors.toList()); + Collections.sort(oneList);//正序排序 + + List lawsMonthlyReportWriteEOS = new LinkedList<>(); + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : oneList) { + String oneId = lawsMonthlyReportTitleTemplateEO.getId(); + //一级目录下的二级目录 + List twoList = list.stream().filter(e -> StringUtils.isNotBlank(e.getParentId()) && oneId.equals(e.getParentId())).collect(Collectors.toList()); + Collections.sort(twoList);//正序排序 + + //一级目录下的月报 + for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : twoList) { + for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : lawsMonthlyReportWriteEOList) { + if(oneId.equals(lawsMonthlyReportWriteEO.getMemoriesChapterOne()) && monthlyReportTitleTemplateEO.getId().equals(lawsMonthlyReportWriteEO.getMemoriesChapter())){ + lawsMonthlyReportWriteEOS.add(lawsMonthlyReportWriteEO); + } + } + } + +// List lawsMonthlyReportWriteEOListOne = lawsMonthlyReportWriteEOList.stream() +// .filter(e -> oneId.equals(e.getMemoriesChapterOne())).collect(Collectors.toList()); +// lawsMonthlyReportWriteEOS.addAll(lawsMonthlyReportWriteEOListOne); + } + + //法规月报id - List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); - List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + List lawsMonthlyReportIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + List userIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); List userIds = new ArrayList<>(); for (String s : userIdList) { if(StringUtils.isNotBlank(s)){ @@ -343,7 +382,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, +// Integer pageNo, +// Integer pageSize, +// HttpServletRequest req) { +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); +// queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); +// //管理员查看全部数据,其余人只能查看自己的数据 +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); +// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ +// queryWrapper.in("create_by",currentUser.getUsername()); +// } +// Page page = new Page(pageNo, pageSize); +// Page 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(); +// +// //新征求意见清单模板 +// List newOpinionTemplateEOList = new ArrayList<>(); +// if(lawsMonthlyReportIdList.size() != 0){ +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); +// newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); +// } +// +// +// //新发布标准清单模板 +// List newStandardTemplateEOList = new ArrayList<>(); +// if(lawsMonthlyReportIdList.size() != 0){ +// LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); +// qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); +// newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); +// } +// +// +// for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { +// //处理法规联系人 +// lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut()); +// //处理章节目录 +// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ +// List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() +// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); +// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ +// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); +// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ +// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); +// } +// } +// //处理章节目录对应的一级目录 +// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapterOne())){ +// List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() +// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapterOne().equals(e.getId())).collect(Collectors.toList()); +// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ +// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); +// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ +// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); +// } +// } +// +// if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ +// //新征求意见清单模板 +// List collect = newOpinionTemplateEOList.stream() +// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); +// lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect); +// +// }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ +// //新发布标准清单模板 +// List collect = newStandardTemplateEOList.stream() +// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); +// lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); +// } +// +// //处理导出状态 +// String exportState = lawsMonthlyReportWriteEO.getExportState(); +// if(StringUtils.isNotBlank(exportState)){ +// if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){ +// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ +// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName()); +// }else{ +// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn()); +// } +// }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){ +// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ +// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName()); +// }else{ +// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn()); +// } +// } +// } +// } +// return pageInfo; +// } private void lawsContact(List userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) { String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); @@ -1269,4 +1421,32 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl list){ + Page page =new Page(); + if(list==null){ + return null; + } + int size = list.size(); + if(pageSize > size){ + pageSize = size; + } + if(pageSize!=0){ + //求出最⼤页数，防⽌currentPage越界 + int maxPage = size % pageSize ==0? size / pageSize : size / pageSize +1; + if(currentPage > maxPage){ + currentPage = maxPage; + } + } + //当前页第⼀条数据的下标 + int curIdx = currentPage >1?(currentPage -1)* pageSize :0; + List pageList =new ArrayList(); + //将当前页的数据放进pageList + for(int i =0; i < pageSize && curIdx + i < size; i++){ + pageList.add(list.get(curIdx + i)); + } + page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList); + return page; + } + } From 12041eb48ad7625f748a65e5efd28c15945a6f14 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 14 Oct 2022 11:38:23 +0800 Subject: [PATCH 25/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=90=E9=83=A8=E9=97=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDepartServiceImpl.java | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 02027b250..8c5c3d639 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; import static com.jero.modules.system.util.FindsDepartsChildrenUtil.convertSysDepartToSysDepartTreeModel; @@ -286,7 +288,37 @@ public class SysDepartServiceImpl extends ServiceImpl getSubDepIdsByDepId(String departId) { - return this.baseMapper.getSubDepIdsByDepId(departId); + List idList = new ArrayList<>(); + if(StringUtils.isNotEmpty(departId)) { + // 查询所有部门 + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); + List listAll = this.list(query); + + List result = new ArrayList<>(); + // 递归查询 指定父节点下的所有子节点，包括父节点 + if (CollectionUtil.isNotEmpty(listAll)) { + recursion(listAll, result, departId); + } + + + idList.add(departId); // 加上父节点 + idList = result.stream().map(SysDepart::getId).collect(Collectors.toList()); + + } + return idList; + } + + // 递归查询子节点 + private void recursion(List listAll, List result, String fatherId) { + List childern = listAll.stream().filter(e-> fatherId.equals(e.getParentId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(childern)) { + result.addAll(childern); + for(SysDepart depart : childern) { + recursion(listAll, result, depart.getId()); + } + + } } @Override From f3327acc20ebba31ca090770597dfb0c91ca1cd6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 14 Oct 2022 12:00:03 +0800 Subject: [PATCH 26/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--off?= =?UTF-8?q?ice=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 103 +++++++++- .../jero/modules/report/util/WordUtil.java | 191 +++++++++++++----- 2 files changed, 240 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 0b8f0f108..cb571424d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1025,17 +1025,26 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, String titleCN, XWPFDocument document) { //封面标识 String flag = "cover"; String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; + //标题前面添加一个换行 + WordUtil.exportWord(document, "", null, ParagraphAlignment.CENTER, 0, null, + false, false, "Blue Sky Noto Regular",null,null,"break"); - titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; + //添加标题 WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, false, false, "Blue Sky Noto Regular",null,null,flag); + + //标题下面添加9个换行 + for (int i = 0; i < 9; i++) { + WordUtil.exportWord(document, "", null, ParagraphAlignment.CENTER, 0, null, + false, false, "Blue Sky Noto Regular",null,null,"break"); + } WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12, false, false, "Blue Sky Noto Regular",null,null,flag); @@ -1060,7 +1069,42 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, +// String titleCN, +// XWPFDocument document) { +// //封面标识 +// String flag = "cover"; +// String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; +// +// titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; +// WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0]; +// String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1]; +// int mothLast = Integer.valueOf(mothNew) + 1; +// +// //添加说明 2022/7/15 至 2022/8/14 期间发布的主要内容 +// String text = year + "/" + mothNew +"/15 至 "+year+"/"+mothLast+"/14期间发布的主要内容"; +// WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// //添加换行 +// WordUtil.exportWord(document, "\r\n", null, ParagraphAlignment.CENTER, 0, null, +// false, false, null,null,null,flag); +// +// //添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队 +// String text1 = "编辑: 整车工程 - 法规与认证&环保与材料科团队"; +// WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// //添加下一页 +// document.createParagraph().createRun().addBreak(BreakType.PAGE); +// } + //封面(office版本) private void coverEn(List lawsMonthlyReportWriteEOS, String titleCN, XWPFDocument document) { @@ -1074,11 +1118,19 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, +// String titleCN, +// XWPFDocument document) { +// //封面标识 +// String flag = "cover"; +// +// String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0]; +// String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1]; +// int mothLast = Integer.valueOf(mothNew) + 1; +// String moth = mothNew+"/"+year; +// String mothNewEn = getMothEn(mothNew); +// String mothLastEn = getMothEn(String.valueOf(mothLast)); +// +//// String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; +// +// titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; +// WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// +// +// //添加说明 Update between July 15, 2022 and August 14, 2022 +// String text = "Update between "+mothNewEn+" 15,"+year+" and "+mothLastEn+" 14,"+year; +// WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// //添加换行 +// WordUtil.exportWord(document, "\r\n", null, ParagraphAlignment.CENTER, 0, null, +// false, false, null,null,null,flag); +// +// //添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队 +// String text1 = "Edit By: Regulation & Homologation, Environmental & Materials Team"; +// WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11, +// false, false, "Blue Sky Noto Regular",null,null,flag); +// +// //添加下一页 +// document.createParagraph().createRun().addBreak(BreakType.PAGE); +// } private String getMothEn(String moth){ String result = ""; 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 048c0ee08..ddf6347d9 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 @@ -128,6 +128,10 @@ public class WordUtil { } XWPFRun titleParagraphRun = titleParagraph.createRun(); + //封面中的换行 + if("break".equals(flag)){ + titleParagraphRun.addBreak(); + } if (isNewline) { titleParagraphRun.setText("\r"); } else { @@ -202,45 +206,7 @@ public class WordUtil { styles.addStyle(style); } -// @SneakyThrows -// public static void exportHeardAndFoot(XWPFDocument document){ -//// XWPFDocument document = new XWPFDocument(); -// -// // create header-footer -// XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy(); -// if (headerFooterPolicy == null) headerFooterPolicy = document.createHeaderFooterPolicy(); -// -// // create header start -// XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT); -// -// XWPFParagraph paragraph = header.createParagraph(); -// paragraph.setAlignment(ParagraphAlignment.CENTER); -// -// XWPFRun run = paragraph.createRun(); -// run.setText("Header"); -// -// // create footer start -// XWPFFooter footer = headerFooterPolicy.createFooter(XWPFHeaderFooterPolicy.DEFAULT); -// -// paragraph = footer.createParagraph(); -// paragraph.setAlignment(ParagraphAlignment.CENTER); -// -// run = paragraph.createRun(); -// run.setText("Footer"); -// -// CTSectPr sectPr = document.getDocument().getBody().getSectPr(); -// if (sectPr == null) sectPr = document.getDocument().getBody().addNewSectPr(); -// CTPageMar pageMar = sectPr.getPgMar(); -// if (pageMar == null) pageMar = sectPr.addNewPgMar(); -// pageMar.setLeft(BigInteger.valueOf(2000)); //720 TWentieths of an Inch Point (Twips) = 720/20 = 36 pt = 36/72 = 0.5" -// pageMar.setRight(BigInteger.valueOf(720)); -// pageMar.setTop(BigInteger.valueOf(1440)); //1440 Twips = 1440/20 = 72 pt = 72/72 = 1" -// pageMar.setBottom(BigInteger.valueOf(1440)); -// -// pageMar.setHeader(BigInteger.valueOf(2000)); //45.4 pt * 20 = 908 = 45.4 pt header from top -// pageMar.setFooter(BigInteger.valueOf(568)); //28.4 pt * 20 = 568 = 28.4 pt footer from bottom -// -// } + //主要内容生成页眉页脚(office版本) @SneakyThrows public static void exportHeardAndFoot(XWPFDocument document,String month){ XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy(); @@ -266,7 +232,7 @@ public class WordUtil { picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID); run.addTab(); is.close(); - run.setText(" "+month); + run.setText(" "+month); run.setFontSize(11); run.setFontFamily("Blue Sky Noto Regular"); } @@ -313,20 +279,107 @@ public class WordUtil { CTSectPr sectPr = document.getDocument().getBody().getSectPr(); if (sectPr == null) sectPr = document.getDocument().getBody().addNewSectPr(); - //设置页面大小 + //设置页面大小(21*29.7) CTPageSz pgSz = sectPr.addNewPgSz(); - pgSz.setW(BigInteger.valueOf(11907)); - pgSz.setH(BigInteger.valueOf(16840)); + pgSz.setW(BigInteger.valueOf(11905)); + pgSz.setH(BigInteger.valueOf(16838)); CTPageMar pageMar = sectPr.getPgMar(); if (pageMar == null) pageMar = sectPr.addNewPgMar(); - pageMar.setLeft(BigInteger.valueOf(1803)); //左边距 - pageMar.setRight(BigInteger.valueOf(1803));//右边距 + pageMar.setLeft(BigInteger.valueOf(1797)); //左边距 + pageMar.setRight(BigInteger.valueOf(1797));//右边距 pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度 pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度 pageMar.setHeader(BigInteger.valueOf(720)); //页眉上边框到顶部的距离 pageMar.setFooter(BigInteger.valueOf(720)); //页脚下边框到底部的距离 } + //主要内容生成页眉页脚(WPS版本) +// @SneakyThrows +// public static void exportHeardAndFoot(XWPFDocument document,String month){ +// XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy(); +// if (headerFooterPolicy == null) headerFooterPolicy = document.createHeaderFooterPolicy(); +// XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT); +// +//// String logoFilePath = "/jero-boot/home/weilai.png"; +// String logoFilePath = WordUtil.class.getClassLoader().getResource("static/home/weilai.png").getPath(); +// //页眉第一个段落展示logo----------------------------------------------------------------------------------- +// if (org.apache.commons.lang3.StringUtils.isNotBlank(logoFilePath)) { +// XWPFParagraph logo = header.createParagraph(); +// logo.setAlignment(ParagraphAlignment.LEFT); +// XWPFRun run = logo.createRun(); +// +// String imgFile = logoFilePath; +// 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图片不显示 +// blipID = header.getRelationId(picturedata); +// } +// picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID); +// run.addTab(); +// is.close(); +// run.setText(" "+month); +// run.setFontSize(11); +// run.setFontFamily("Blue Sky Noto Regular"); +// } +// //页眉第二个段落展示日期------------------------------------------------------------ +// XWPFParagraph paragraph = header.createParagraph();//创建新的段落 +//// paragraph.setAlignment(ParagraphAlignment.RIGHT);//段落文本的对齐方式 +// XWPFRun run = paragraph.createRun(); +//// run.setText(month); +// +// //页脚(三个段落分别展示3个内容)----------------------------------------------------- +// XWPFFooter footer = headerFooterPolicy.createFooter(XWPFHeaderFooterPolicy.DEFAULT); +// +// paragraph = footer.createParagraph(); +// paragraph.setAlignment(ParagraphAlignment.CENTER); +// run = paragraph.createRun(); +// run.setText("NIO Internal"); +// run.setFontSize(11); +// run.setFontFamily("Blue Sky Standard Regular"); +// +// paragraph = footer.createParagraph(); +// paragraph.setAlignment(ParagraphAlignment.LEFT); +// run = paragraph.createRun(); +// run.setText("NIO.com"); +// run.setFontSize(11); +// run.setFontFamily("Blue Sky Noto Regular"); +// +// //生成页码--------------------------------------------------------------------- +// paragraph = footer.createParagraph(); +// paragraph.setAlignment(ParagraphAlignment.RIGHT); +// run = paragraph.createRun(); +// CTFldChar fldChar = run.getCTR().addNewFldChar(); +// fldChar.setFldCharType(STFldCharType.Enum.forString("begin")); +// +// run = paragraph.createRun(); +// CTText ctText = run.getCTR().addNewInstrText(); +// ctText.setStringValue("PAGE \\* MERGEFORMAT"); +// ctText.setSpace(SpaceAttribute.Space.Enum.forString("preserve")); +// +// fldChar = run.getCTR().addNewFldChar(); +// fldChar.setFldCharType(STFldCharType.Enum.forString("end")); +// //---------------------------------------------------------------------------- +// +// +// +// CTSectPr sectPr = document.getDocument().getBody().getSectPr(); +// if (sectPr == null) sectPr = document.getDocument().getBody().addNewSectPr(); +// //设置页面大小 +// CTPageSz pgSz = sectPr.addNewPgSz(); +// pgSz.setW(BigInteger.valueOf(11907)); +// pgSz.setH(BigInteger.valueOf(16840)); +// CTPageMar pageMar = sectPr.getPgMar(); +// if (pageMar == null) pageMar = sectPr.addNewPgMar(); +// pageMar.setLeft(BigInteger.valueOf(1803)); //左边距 +// pageMar.setRight(BigInteger.valueOf(1803));//右边距 +// pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度 +// pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度 +// +// pageMar.setHeader(BigInteger.valueOf(720)); //页眉上边框到顶部的距离 +// pageMar.setFooter(BigInteger.valueOf(720)); //页脚下边框到底部的距离 +// } /** * 主页面(只有页脚) @@ -356,18 +409,58 @@ public class WordUtil { if (sectPr == null) sectPr = document.getDocument().getBody().addNewSectPr(); //设置页面大小 CTPageSz pgSz = sectPr.addNewPgSz(); - pgSz.setW(BigInteger.valueOf(11907)); - pgSz.setH(BigInteger.valueOf(16840)); + pgSz.setW(BigInteger.valueOf(11905)); + pgSz.setH(BigInteger.valueOf(16838)); CTPageMar pageMar = sectPr.getPgMar(); if (pageMar == null) pageMar = sectPr.addNewPgMar(); - pageMar.setLeft(BigInteger.valueOf(1803)); //左边距 - pageMar.setRight(BigInteger.valueOf(1803));//右边距 + pageMar.setLeft(BigInteger.valueOf(1797)); //左边距 + pageMar.setRight(BigInteger.valueOf(1797));//右边距 pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度 pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度 pageMar.setHeader(BigInteger.valueOf(500)); //页眉上边框到顶部的距离 pageMar.setFooter(BigInteger.valueOf(1200)); //页脚下边框到底部的距离 } +// /** +// * 主页面(只有页脚 WPS版本) +// * @param document +// * @param month +// */ +// @SneakyThrows +// public static void exportHeardAndFootMain(XWPFDocument document,String month){ +// XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy(); +// if (headerFooterPolicy == null) headerFooterPolicy = document.createHeaderFooterPolicy(); +//// XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT); +//// XWPFParagraph paragraph = header.createParagraph();//创建新的段落 +//// XWPFRun run = paragraph.createRun(); +// +// XWPFFooter footer = headerFooterPolicy.createFooter(XWPFHeaderFooterPolicy.DEFAULT); +// XWPFParagraph paragraph = footer.createParagraph(); +// paragraph.setAlignment(ParagraphAlignment.CENTER); +// XWPFRun run = paragraph.createRun(); +// run.setText("NIO Internal"); +// run.setFontSize(18); +// run.setFontFamily("Blue Sky Standard Regular"); +//// run.setFontFamily("Blue Sky Noto Regular"); +// run.setBold(true); +// +// +// CTSectPr sectPr = document.getDocument().getBody().getSectPr(); +// if (sectPr == null) sectPr = document.getDocument().getBody().addNewSectPr(); +// //设置页面大小 +// CTPageSz pgSz = sectPr.addNewPgSz(); +// pgSz.setW(BigInteger.valueOf(11907)); +// pgSz.setH(BigInteger.valueOf(16840)); +// CTPageMar pageMar = sectPr.getPgMar(); +// if (pageMar == null) pageMar = sectPr.addNewPgMar(); +// pageMar.setLeft(BigInteger.valueOf(1803)); //左边距 +// pageMar.setRight(BigInteger.valueOf(1803));//右边距 +// pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度 +// pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度 +// +// pageMar.setHeader(BigInteger.valueOf(500)); //页眉上边框到顶部的距离 +// pageMar.setFooter(BigInteger.valueOf(1200)); //页脚下边框到底部的距离 +// } /** * 导出工具示例 From c51e215107729b782df98a132e536bd036cb7762 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 14 Oct 2022 14:49:40 +0800 Subject: [PATCH 27/54] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileSplitItemsEOServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index c4c4dd28f..b7a5cb5fa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -576,13 +576,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Fri, 14 Oct 2022 15:28:03 +0800 Subject: [PATCH 28/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +++-- jero-web/src/common/lang/zh-cn.js | 3 ++- .../src/views/documentTools/documentTranslation/index.vue | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 93cd90b7e..513b89a3e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -199,6 +199,7 @@ module.exports = { OperationType: 'Operation Type', selectOperationType: 'Please select Operation type', selectProblemClassification:'Please select Problem Classification', + selectTranslationResults:'Please select Translation results', selectMarket:'Please select Market', RequestMethod: 'Request Method', RequestParameters: 'Request Parameters', @@ -348,8 +349,8 @@ module.exports = { standard: 'Number', title: 'Title', TextStatus: 'Text Status', - PleaseEnter: 'Please enter', - PleaseSelect: 'Please select', + PleaseEnter: 'Please enter ', + PleaseSelect: 'Please select ', PleaseEnterOrSelect: 'Please Enter Or Select', ModificationTime: 'Modification Time', ModificationContent: 'Modification Content', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e76df82f0..c56ac1522 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -197,10 +197,11 @@ module.exports = { enterSearchKeyword: '请输入搜索关键词', enterSearchContent:'请输入搜索内容', enterStandard:'请输入编号', - enterTitle:'请输入标题', + entertitle:'请输入标题', OperationType: '操作类型', selectOperationType: '请选择操作类型', selectProblemClassification:'请选择问题分类', + selectTranslationResults:'请选择翻译结果', selectMarket:'请选择市场', RequestMethod: '请求方法', RequestParameters: '请求参数', diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index d12d90c04..c78b81e2a 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -8,7 +8,7 @@
{{$t('standard')}}
-
@@ -17,7 +17,7 @@
{{$t('title')}}
-
@@ -27,7 +27,7 @@ {{$t('translationResults')}}
From 9b28942e5c566cb8e79698644ea4aa27aea7271e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 14 Oct 2022 15:31:06 +0800 Subject: [PATCH 29/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/report/util/WordUtil.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 ddf6347d9..16fdbe557 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 @@ -556,25 +556,25 @@ public class WordUtil { String workProgressEn = lawsMonthlyReportWriteEO.getWorkProgressEn();//NIO工作进展英文 String lawsContactTemp = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 String lawsContact = getLawsContact(loginUserList, lawsContactTemp); - if(StringUtils.isNotEmpty(lawsContact)){ - List lawsContactList = Arrays.asList(lawsContact.split(",")); - if (lawsContactList.size() > 4) { - StringBuilder str = new StringBuilder(); - int count = 0; - for (String s : lawsContactList) { - str.append(s + ","); - count++; - if (count % 4 == 0) { - str.append("\n"); - } - } - if(str.toString().endsWith("\n")){ - lawsContact = str.substring(0,str.length()-2); - }else{ - lawsContact = str.substring(0,str.length()-1); - } - } - } +// if(StringUtils.isNotEmpty(lawsContact)){ +// List lawsContactList = Arrays.asList(lawsContact.split(",")); +// if (lawsContactList.size() > 4) { +// StringBuilder str = new StringBuilder(); +// int count = 0; +// for (String s : lawsContactList) { +// str.append(s + ","); +// count++; +// if (count % 4 == 0) { +// str.append("\n"); +// } +// } +// if(str.toString().endsWith("\n")){ +// lawsContact = str.substring(0,str.length()-2); +// }else{ +// lawsContact = str.substring(0,str.length()-1); +// } +// } +// } String link = lawsMonthlyReportWriteEO.getLink();//链接 String technologyTerritoryName = ""; From e6302aa444553c6bab7079660f6cab1360c22518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 14 Oct 2022 15:35:05 +0800 Subject: [PATCH 30/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 513b89a3e..5818f4338 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -3,11 +3,11 @@ module.exports = { account: 'User Account', EnterAccountFuzzyQuery: 'Enter Account Fuzzy Search', Gender: 'Gender', - pleaseSelect: 'Please Select', + pleaseSelect: 'Please Select ', male: 'Male', female: 'Female', RealName: 'User Name', - pleaseEnter: 'Please Enter', + pleaseEnter: 'Please Enter ', phoneNumber: 'Phone Number', query: 'Search', userStatues: 'User Status', From 32ec7905a71c05b66eeb4d3dfd7e71f0de27583d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 14 Oct 2022 15:52:10 +0800 Subject: [PATCH 31/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5818f4338..3339a98a9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -3,11 +3,11 @@ module.exports = { account: 'User Account', EnterAccountFuzzyQuery: 'Enter Account Fuzzy Search', Gender: 'Gender', - pleaseSelect: 'Please Select ', + pleaseSelect: 'Please Select ', male: 'Male', female: 'Female', RealName: 'User Name', - pleaseEnter: 'Please Enter ', + pleaseEnter: 'Please Enter ', phoneNumber: 'Phone Number', query: 'Search', userStatues: 'User Status', From 29061f97486284dec6422073a1a8a13493cfb3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 14 Oct 2022 15:54:14 +0800 Subject: [PATCH 32/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3339a98a9..5818f4338 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -3,11 +3,11 @@ module.exports = { account: 'User Account', EnterAccountFuzzyQuery: 'Enter Account Fuzzy Search', Gender: 'Gender', - pleaseSelect: 'Please Select ', + pleaseSelect: 'Please Select ', male: 'Male', female: 'Female', RealName: 'User Name', - pleaseEnter: 'Please Enter ', + pleaseEnter: 'Please Enter ', phoneNumber: 'Phone Number', query: 'Search', userStatues: 'User Status', From 7c5287ff036c2dbb19e6288fd4f417c13a9e8f4f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 14 Oct 2022 16:04:42 +0800 Subject: [PATCH 33/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--wor?= =?UTF-8?q?d=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/util/WordUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 16fdbe557..dc18a8ca8 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 @@ -1165,6 +1165,7 @@ public class WordUtil { ctTc.addNewP() : ctTc.getPArray(0); //getParagraph(ctP) 获取 XWPFParagraph XWPFParagraph par = cell.getParagraph(ctP); + par.setAlignment(ParagraphAlignment.LEFT); //XWPFRun 设置格式 XWPFRun run = par.createRun(); //单元格内容换行 @@ -1202,6 +1203,7 @@ public class WordUtil { ctTc.addNewP() : ctTc.getPArray(0); //getParagraph(ctP) 获取 XWPFParagraph XWPFParagraph par = cell.getParagraph(ctP); + par.setAlignment(ParagraphAlignment.LEFT); //XWPFRun 设置格式 XWPFRun run = par.createRun(); //单元格内容换行 □ ■ @@ -1262,13 +1264,13 @@ public class WordUtil { String blank = ""; switch (value) { case "M": - blank = " "; + blank = " "; break; case "N": blank = "\r\n"; break; case "企业": - blank = " "; + blank = " "; break; case "整车": blank = " "; @@ -1283,10 +1285,10 @@ public class WordUtil { blank = ""; break; case "Enterprise": - blank = " "; + blank = " "; break; case "Vehicle": - blank = " "; + blank = " "; break; case "System/Parts": blank = "\r\n"; From 2c6f8f1d5a87129d2450a804b5fead6bf2bf4e18 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 16:50:48 +0800 Subject: [PATCH 34/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 13 ++++++++++++- .../components/problemKnowledgeBase.vue | 13 ++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 349bc2805..375192fd7 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -219,6 +219,17 @@ localStorage.removeItem('serial_number') } this.isTrue = true + let BaseQuery = localStorage.getItem('problemknowledgeBase') + if (BaseQuery) { + let content = JSON.parse(BaseQuery) + if (content.id) { + this.isTrue = false + this.$nextTick(() => { + this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(content))) + }) + } + localStorage.removeItem('problemknowledgeBase') + } this.getList() this.replacePage() }, @@ -351,7 +362,7 @@ pageSize: this.pageSize, searchStr: this.searchStr, problemTypes: selectedTags.join(','), - releaseStatus:'Have released' + releaseStatus: 'Have released' } this.loading = true getAction(this.url.getInfoList, query).then((res) => { diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 33f3ed790..65f3dbeab 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -176,13 +176,20 @@ }) }, checkedClick(item) { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseView', + localStorage.setItem('problemknowledgeBase',JSON.stringify(item)) + this.$router.push({ + path: '/problemknowledgeBase', query: { id: item.id } }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemknowledgeBase', + // query: { + // id: item.id + // } + // }) + // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page From 886d4a19611c3294b97ff4c833bae6c1c2fbbb70 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 17 Oct 2022 17:21:39 +0800 Subject: [PATCH 35/54] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/CollectionType/index.vue | 6 +++++- .../src/components/uploadFileChangeDown/file.vue | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 2f8d6386c..2b59628ee 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -652,7 +652,7 @@
+ :detailDate='detailDate' watermark='download'>
@@ -667,6 +667,10 @@ type: Object, default: {}, require: true + }, + watermark: { + type: String, + default: '' } }, data() { diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index e742821cb..19b236668 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -43,7 +43,7 @@ import { mapGetters } from 'vuex' export default { name: 'file', - props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate'], + props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate','watermark'], data() { return { visible: false, @@ -91,7 +91,11 @@ import { mapGetters } from 'vuex' methods: { ...mapGetters(['userInfo']), download() { - downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId }) + if(this.watermark == 'download'){ + downloadFile('/sys/common/downLoadFileNOMark', this.template.templateName, { id: this.template.templateId }) + } else { + downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId }) + } }, perentHandleFunc(data) { this.myfileList = data @@ -220,7 +224,11 @@ import { mapGetters } from 'vuex' // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) // window.open(url, '_blank') // } else { + if(this.watermark == 'download'){ + downloadFile('/sys/common/downLoadFileNOMark', fileQuery.fileName, { id: fileQuery.id }) + }else { downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + } // } } } From 5a09fefa76f1ab1efbbc450346f4e7181511a173 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 17 Oct 2022 17:22:28 +0800 Subject: [PATCH 36/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E4=B8=8B=E8=BD=BDpdf=E6=97=A0?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/CommonController.java | 96 ++++++++++++++++--- 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 6e92fa0dd..d95b68abb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -7,7 +7,6 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.LoginUser; import com.jero.common.util.RestUtil; import com.jero.common.util.TokenUtils; import com.jero.common.util.oConvertUtils; @@ -19,7 +18,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; @@ -27,12 +25,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.AntPathMatcher; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.HandlerMapping; @@ -41,12 +34,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Date; @@ -382,12 +370,13 @@ public class CommonController { fileName = ossFile.getFileName(); response.setContentType("application/force-download");// 设置强制下载不打开 response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); - InputStream download = CosBootUtil.download(filePath); + File file = new File(filePath); if(file.getName().endsWith(".pdf") || file.getName().endsWith(".PDF")){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String currentTime = sdf.format(new Date()); String waterContent = userName+" "+currentTime; + InputStream download = CosBootUtil.download(filePath); newFile = PDFUtils.PDFWatermark(download,uploadpath,file.getName(),waterContent); inputStream = new FileInputStream(newFile.getPath()); }else{ @@ -432,6 +421,83 @@ public class CommonController { } } + /** + * word,excel预览 cos -pdf无水印 + * + * @param id 传入文件id + * @param request + * @param response + */ + @GetMapping(value = "/downLoadFileNOMark") + public void downLoadFileNoPDFWatermarkCos(String id,HttpServletRequest request, HttpServletResponse response,String userName) { + if(StringUtils.isBlank(id)){ + throw new JeroBootException("参数信息不全"); + } + id = id.split("\\.")[0]; + // 查询数据表数据是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OSSFile::getId,id); + OSSFile ossFile = ossFileService.getOne(queryWrapper); + if( null == ossFile){ + throw new JeroBootException("文件不存在"); + } + InputStream inputStream = null; + OutputStream outputStream = null; + File newFile =null; + try { + String fileName = ""; + //本地下载 + String filePath = ossFile.getUrl(); + if(!CosBootUtil.doesObjectExist(filePath)){ + response.setStatus(404); + throw new RuntimeException("文件不存在.."); + } + // 文件名称 + fileName = ossFile.getFileName(); + response.setContentType("application/force-download");// 设置强制下载不打开 + response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); + + File file = new File(filePath); + inputStream = CosBootUtil.download(filePath); + outputStream = response.getOutputStream(); + byte[] buf = new byte[1024]; + int len; + while ((len = inputStream.read(buf)) > 0) { + outputStream.write(buf, 0, len); + } + response.flushBuffer(); + } catch (IOException e) { + log.error("文件下载失败" + e.getMessage()); + response.setStatus(404); + e.printStackTrace(); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + + } + if (newFile != null) { + try { + newFile.delete(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + } + + } + } + /** * 文件下载 * From 71f2d1f90b58f31faadb29669a9e2d45f2609803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 17 Oct 2022 18:56:54 +0800 Subject: [PATCH 37/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 4a67f32ad..e4198f9f9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -127,10 +127,24 @@ public class SysUserController { public Result> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); + Map reqMap = req.getParameterMap(); + Map newReqMap = new HashMap<>(); + for (String key : reqMap.keySet()){ + if(!key.equals("orgCode")){ + newReqMap.put(key,reqMap.get(key)); + } + } + user.setOrgCode(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, newReqMap); //TODO 外部模拟登陆临时账号，列表不显示 queryWrapper.ne("username", "_reserve_user_external"); - Page page = new Page(pageNo, pageSize); + String[] orgCode = reqMap.get("orgCode"); + if(null != orgCode && orgCode.length > 0){ + List orgCodeList = sysDepartService.getSubDepIdsByDepId(orgCode[0]); + orgCodeList.add(orgCode[0]); + queryWrapper.in("org_code",orgCodeList); + } + Page page = new Page<>(pageNo, pageSize); IPage pageList = sysUserService.page(page, queryWrapper); //批量查询用户的所属部门 @@ -1549,6 +1563,12 @@ public class SysUserController { for (SysDepartTreeModel sdtm: departTreeModelList) { dutList.addAll(findChildNode(sdtm)); } + SysUser admin = sysUserService.getUserByName("admin"); + DepartUserTree dut = new DepartUserTree(); + dut.setId(admin.getId()); + dut.setName(admin.getUsername()); + dut.setType("User"); + dutList.add(dut); result.setResult(dutList); result.setSuccess(true); return result; From 0a13b9deafdd3293888eec7990a915b8389ac922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 17 Oct 2022 18:57:08 +0800 Subject: [PATCH 38/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0468e8dc6..a1169539c 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1179,10 +1179,10 @@ update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6 -- 配置表，增加问题知识库预览图片配置 2022-09-27 已同步生产环境 INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL'); ---问题知识库，增加字段 发布状态 2022-10-13 未同步生产环境 +--问题知识库，增加字段 发布状态 2022-10-13 已同步生产环境 ALTER TABLE `laws_weilai`.`problem_knowledge_base` ADD COLUMN `release_status` varchar(50) NULL COMMENT '发布状态' AFTER `release_time`; ---处理问题知识库数据，发布人，发布时间，发布状态数据sql 2022-10-13 未同步生产环境 +--处理问题知识库数据，发布人，发布时间，发布状态数据sql 2022-10-13 已同步生产环境 update problem_knowledge_base pkd set pkd.release_status = 'Have released',pkd.release_time = pkd.create_time,pkd.release_user_id = (select su.id from sys_user su where su.username = pkd.create_by) From ab92a4dccabcc00deb5bd430137130acdfb3309e Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 09:40:53 +0800 Subject: [PATCH 39/54] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ca9de26a5..c09c6e5c9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1456,15 +1456,18 @@ this.selectedRowKeys = value }, searchQuery() { + this.selectedRowKeys = [] this.getList() }, searchReset() { this.queryParam = {} + this.selectedRowKeys = [] this.$refs.globalAdvancedQueryRef.resetLine() this.$refs.globalAdvancedQueryRef.emitCallback() // this.getList() }, addModelList() { + this.selectedRowKeys = [] this.getList() }, handleSuperQuery(params, matchType) { @@ -2130,7 +2133,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { @@ -2151,7 +2154,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else { @@ -2484,17 +2487,17 @@ } ::v-deep .ant-table-body-one { - padding-bottom: 0!important; + padding-bottom: 0 !important; } ::v-deep .antfixedLeft { - padding-bottom: 0!important; - overflow: scroll!important; + padding-bottom: 0 !important; + overflow: scroll !important; } ::v-deep .antfixedRight { - padding-bottom: 0!important; - overflow: scroll!important; + padding-bottom: 0 !important; + overflow: scroll !important; }