合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!12

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<DummyInventoryB
                             if(CollectionUtils.isNotEmpty(updateLogList)){
                                 List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
                                 for(int i=0 ; i < contentLogList.size() ;i++){
-                                    contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
+                                    String content = contentLogList.get(i);
+                                    if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
+                                        content = content.substring(0,content.length()-5);
+                                    }
+                                    contentLog += "（"+ (i+1) +"）" + content + "</br>";
                                 }
                             }
                         }
+                        if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
+                            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<DummyInventoryB
 
                         List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
                         for(int i=0 ; i < contentLogList.size() ;i++){
-                            contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
+                            String content = contentLogList.get(i);
+                            if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
+                                content = content.substring(0,content.length()-5);
+                            }
+                            contentLog += "（"+ (i+1) +"）" + content + "</br>";
+                        }
+                        if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
+                            contentLog = contentLog.substring(0,contentLog.length()-5);
                         }
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java

@@ -344,14 +344,29 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
                 String key = entry.getKey();
                 String value = (String) entry.getValue();
-                if (ObjectUtils.isNotEmpty(value)) {
+                if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
+                    Map<String, Object> queryMapNew = new HashMap<>();
+                    Map<String, Object> queryMapTempNew = new HashMap<>();
+                    queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*");
+                    queryMapNew.put("wildcard", queryMapTempNew);
+                    must.add(queryMapNew);
+                }else{
+                    Map<String, Object> map = new HashMap<>();
                     Map<String, Object> queryMap = new HashMap<>();
                     Map<String, Object> queryMapTemp = new HashMap<>();
-                    queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
+                    queryMapTemp.put("query", value);
-//                    queryMapTemp.put(key, "*"+value+"*");
+                    queryMap.put(key, queryMapTemp);
-                    queryMap.put("wildcard", queryMapTemp);
+                    map.put("match",queryMap);
-                    must.add(queryMap);
+                    must.add(map);
                 }
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    Map<String, Object> queryMap = new HashMap<>();
+//                    Map<String, Object> queryMapTemp = new HashMap<>();
+//                    queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
+////                    queryMapTemp.put(key, "*"+value+"*");
+//                    queryMap.put("wildcard", queryMapTemp);
+//                    must.add(queryMap);
+//                }
             }
         }
         //封装时间类型字段查询(时间范围)

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
     }

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -543,8 +543,8 @@
     text-align: center;
     line-height: 32px;
     border-radius: 4px;
-    background: #dbf6e2;
+    background: #f1f3f5;
-    color: #26BD4B;
+    color: #919399;
   }
 
   .accordColor {

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')
             }
           })
         }