From e1b3fab6ae0cdac441b60fdf3ddb6903cf527295 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Tue, 21 Jun 2022 13:28:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=AD=A3=E5=A5=BD=E6=98=AF=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=9F=9F=E5=90=8D=E6=94=B9=E4=B8=BAhttps=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/permission.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 653f3352a..cfde5c21f 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -110,7 +110,7 @@ router.beforeEach((to, from, next) => { // TODO 在部署线上时解开此代码 // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -136,7 +136,7 @@ router.beforeEach((to, from, next) => { // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } From eb7c4568b24359dcb051ee99f47efa22a366bcf6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 21 Jun 2022 13:59:52 +0800 Subject: [PATCH 2/5] =?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 --- .../views/projectManagement/components/TaskList.vue | 4 ++-- .../components/deliverableStatusEchart.vue | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index fc22b5754..a8ec04aa5 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -543,8 +543,8 @@ text-align: center; line-height: 32px; border-radius: 4px; - background: #dbf6e2; - color: #26BD4B; + background: #f1f3f5; + color: #919399; } .accordColor { diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue index 03fdd8c9e..6df3ce6a4 100644 --- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue +++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue @@ -54,7 +54,7 @@ getData() { getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => { if (res.success) { - if (res.result){ + if (res.result) { let listingToConfirmMap = res.result.listingToConfirmMap ? res.result.listingToConfirmMap.listingToConfirmMapList : [] let taskToConfirmMap = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : [] @@ -82,28 +82,28 @@ name: this.$t('notLaunch'), status: res.inventoryAffirmStatus || res.taskAffirmStatus }) - color.push('#00BEBE') + color.push('#707486') } else if (res.inventoryAffirmStatus == 'List to confirm' || res.taskAffirmStatus == 'List to confirm') { data.push({ value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount, name: this.$t('toBeConfirmed'), status: res.inventoryAffirmStatus || res.taskAffirmStatus }) - color.push('#FDB033') + color.push('#00B3BE') } else if (res.inventoryAffirmStatus == 'Accepted' || res.taskAffirmStatus == 'Accepted') { data.push({ value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount, name: this.$t('accept'), status: res.inventoryAffirmStatus || res.taskAffirmStatus }) - color.push('#2F8DF3') + color.push('#26BD4B') } else if (res.inventoryAffirmStatus == 'Rejected' || res.taskAffirmStatus == 'Rejected') { data.push({ value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount, name: this.$t('refuse'), status: res.inventoryAffirmStatus || res.taskAffirmStatus }) - color.push('#9DB9D4') + color.push('#E83030') } }) } From 650e0b6f0e9a3f2d33c8304c23efd08a51fab796 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 14:37:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83--=E7=AB=99=E5=86=85=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index a32d4ee88..83ed551b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -429,10 +429,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList()); for(int i=0 ; i < contentLogList.size() ;i++){ - contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "
"; + String content = contentLogList.get(i); + if(StringUtils.isNotBlank(content) && content.endsWith("
")){ + content = content.substring(0,content.length()-5); + } + contentLog += "（"+ (i+1) +"）" + content + "
"; } } } + if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("
")){ + contentLog = contentLog.substring(0,contentLog.length()-5); + } //列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理 if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) { @@ -481,7 +488,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList()); for(int i=0 ; i < contentLogList.size() ;i++){ - contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "
"; + String content = contentLogList.get(i); + if(StringUtils.isNotBlank(content) && content.endsWith("
")){ + content = content.substring(0,content.length()-5); + } + contentLog += "（"+ (i+1) +"）" + content + "
"; + } + if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("
")){ + contentLog = contentLog.substring(0,contentLog.length()-5); } iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut()); From b2185f4f84b6861cb95465329feaa62275f0faa5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 16:25:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index e3c2c33bd..188d919ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -344,14 +344,22 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { for (Map.Entry entry : otherMap.entrySet()) { String key = entry.getKey(); String value = (String) entry.getValue(); - if (ObjectUtils.isNotEmpty(value)) { - Map queryMap = new HashMap<>(); - Map queryMapTemp = new HashMap<>(); - queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*"); -// queryMapTemp.put(key, "*"+value+"*"); - queryMap.put("wildcard", queryMapTemp); - must.add(queryMap); - } + Map map = new HashMap<>(); + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("query", value); +// queryMapTemp.put("minimum_should_match", 2); + queryMap.put(key, queryMapTemp); + map.put("match",queryMap); + must.add(map); +// if (ObjectUtils.isNotEmpty(value)) { +// Map queryMap = new HashMap<>(); +// Map queryMapTemp = new HashMap<>(); +// queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*"); +//// queryMapTemp.put(key, "*"+value+"*"); +// queryMap.put("wildcard", queryMapTemp); +// must.add(queryMap); +// } } } //封装时间类型字段查询(时间范围) From c96202af214b098a11427ec993b73a4ba5d802e1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 16:45:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 188d919ee..83fd769d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -344,14 +344,21 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { for (Map.Entry entry : otherMap.entrySet()) { String key = entry.getKey(); String value = (String) entry.getValue(); - Map map = new HashMap<>(); - Map queryMap = new HashMap<>(); - Map queryMapTemp = new HashMap<>(); - queryMapTemp.put("query", value); -// queryMapTemp.put("minimum_should_match", 2); - queryMap.put(key, queryMapTemp); - map.put("match",queryMap); - must.add(map); + if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ + Map queryMapNew = new HashMap<>(); + Map queryMapTempNew = new HashMap<>(); + queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*"); + queryMapNew.put("wildcard", queryMapTempNew); + must.add(queryMapNew); + }else{ + Map map = new HashMap<>(); + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("query", value); + queryMap.put(key, queryMapTemp); + map.put("match",queryMap); + must.add(map); + } // if (ObjectUtils.isNotEmpty(value)) { // Map queryMap = new HashMap<>(); // Map queryMapTemp = new HashMap<>();