Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java

@@ -9,6 +9,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
 import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
 import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
+import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.system.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -61,6 +62,10 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
 			paramsExportTemplateEO.setTemplateName(paramsExportTemplateEO.getTemplateName().replace("%", "\\%"));
 		}
 
+		if (StringUtils.isNotBlank(paramsExportTemplateEO.getOrderByField())) {
+			paramsExportTemplateEO.setOrderByField(LineHumpUtil.humpToLine2(paramsExportTemplateEO.getOrderByField()));
+		}
+
 		QueryWrapper<ParamsExportTemplateEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName());
 		queryWrapper.orderBy(StringUtils.isNotBlank(paramsExportTemplateEO.getOrderByField()), "1".equals(paramsExportTemplateEO.getOrderBy())?true:false, paramsExportTemplateEO.getOrderByField())

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java

@@ -9,6 +9,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.template.entity.ParamsTemplateEO;
 import com.jero.modules.cert.template.service.IParamsTemplateEOService;
+import com.jero.modules.ocr.util.LineHumpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -62,6 +63,10 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
 			paramsTemplateEO.setParamsTemplateName(paramsTemplateEO.getParamsTemplateName().replace("%","\\%"));
 		}
 
+		if (StringUtils.isNotBlank(paramsTemplateEO.getOrderByField())) {
+			paramsTemplateEO.setOrderByField(LineHumpUtil.humpToLine2(paramsTemplateEO.getOrderByField()));
+		}
+
 		QueryWrapper<ParamsTemplateEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName())
 				.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java

@@ -1,6 +1,6 @@
 package com.jero.modules.split.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.common.api.vo.Result;
@@ -9,6 +9,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.lanswitch.service.ILanguageSwitchService;
+import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.page.SarFileSplitInfoEOPage;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
@@ -59,7 +60,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@GetMapping(value = "/page")
 	@RequiresPermissions("split:sarFileSplitInfo:page")
 	public Result<?> queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) {
-		LambdaQueryWrapper<SarFileSplitInfoEO> queryWrapper = new LambdaQueryWrapper<>();
+		QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
 		if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){
 			sarFileSplitInfoEOPage.setSerialNumber(sarFileSplitInfoEOPage.getSerialNumber().replace("%","\\%"));
 		}
@@ -67,13 +68,18 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 			sarFileSplitInfoEOPage.setTitle(sarFileSplitInfoEOPage.getTitle().replace("%","\\%"));
 		}
 		if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getFileId())){//判断是不是以及传回文档库
-			queryWrapper.isNotNull(SarFileSplitInfoEO::getFileId);
+			queryWrapper.lambda().isNotNull(SarFileSplitInfoEO::getFileId);
 		}
-		queryWrapper.like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber()), SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEOPage.getSerialNumber())
+		if(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField())){
+			sarFileSplitInfoEOPage.setOrderByField(LineHumpUtil.humpToLine2(sarFileSplitInfoEOPage.getOrderByField()));
+		}
+
+		queryWrapper.lambda().like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber()), SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEOPage.getSerialNumber())
 				.like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getTitle()) && CutEnum.CN.getValue().equals(sarFileSplitInfoEOPage.getCut()), SarFileSplitInfoEO::getTitle, sarFileSplitInfoEOPage.getTitle())
-				.like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getTitle()) && CutEnum.EN.getValue().equals(sarFileSplitInfoEOPage.getCut()), SarFileSplitInfoEO::getTitleEn, sarFileSplitInfoEOPage.getTitle())
-				.orderBy(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField()), "1".equals(sarFileSplitInfoEOPage.getOrderBy())?true:false, SarFileSplitInfoEO::getCreateTime)
-				.orderBy(StringUtils.isBlank(sarFileSplitInfoEOPage.getOrderByField()), false, SarFileSplitInfoEO::getCreateTime);
+				.like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getTitle()) && CutEnum.EN.getValue().equals(sarFileSplitInfoEOPage.getCut()), SarFileSplitInfoEO::getTitleEn, sarFileSplitInfoEOPage.getTitle());
+
+		queryWrapper.orderBy(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField()), "1".equals(sarFileSplitInfoEOPage.getOrderBy())?true:false, sarFileSplitInfoEOPage.getOrderByField())
+				.orderBy(StringUtils.isBlank(sarFileSplitInfoEOPage.getOrderByField()), false, "create_time");
 		Page<SarFileSplitInfoEO> page = new Page<SarFileSplitInfoEO>(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize());
 		IPage<SarFileSplitInfoEO> pageList = sarFileSplitInfoService.page(page, queryWrapper);
 		List<SarFileSplitInfoEO> rows = pageList.getRecords();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -24,7 +24,6 @@ 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;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
-import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.ocr.util.UUIDUtils;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -72,7 +71,6 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
@@ -81,12 +79,10 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -792,6 +788,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         //处理列表表头排序
         if("page".equals(type)) {
             conditionSb.append(" order by SAR_FILE_SPLIT_MENU.display_seq asc");
+
+            if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
+                conditionSb.append(", sar_file_split_items." + (String) parameter.get("orderByField"));
+                if ("1".equals((String) parameter.get("orderBy"))) {
+                    conditionSb.append(" asc");//正序
+                } else if ("2".equals((String) parameter.get("orderBy"))) {
+                    conditionSb.append(" desc");//倒序
+                }
+            }
+
         }
         String condition = conditionSb.toString();
         return condition;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -26,7 +26,7 @@
                       <a-select-option v-for="(item, key) in projectNameList"
                                        :key="key"
                                        :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                     <span class="selectText" :title=" item.name ">
                            {{ item.name}}
                      </span>
                       </a-select-option>
@@ -78,7 +78,7 @@
                       <a-select-option v-for="(item, key) in problemTypeList"
                                        :key="key"
                                        :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title="item.problemLabel ">
+                     <span class="selectText" :title="item.problemLabel ">
                            {{item.problemLabel}}
                      </span>
                       </a-select-option>
@@ -605,4 +605,13 @@
   ::v-deep .ql-snow .ql-picker {
     height: 36px;
   }
+
+  .selectText {
+    width: 100%;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    word-break: break-word;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -390,6 +390,7 @@
 
   .box-content-left .ant-tag-checkable {
     padding: 3px 8px;
+    margin-bottom: 10px;
   }
 
   .box-content-left .ant-tag-checkable-checked {

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -46,7 +46,7 @@
           <span slot="language" slot-scope="text,record">
                 <span>{{text == 1?$t('simplifiedChinese'):$t('English')}}</span>
           </span>
-        <span slot="RegulationMonthlyName" slot-scope="text,record">
+        <span slot="RegulationMonthlyName" :title="text" slot-scope="text,record">
              <a @click="preview(record)">{{text}}</a>
           </span>
         <span slot="operation" slot-scope="text,record">

jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue

@@ -4,7 +4,7 @@
       <span>{{$t('searchScope')}}：</span>
       <span>{{ queryParam.selectValue }}</span>
     </div>
-    <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
+    <a-checkbox-group style="width: 100%" v-model="checkboxText" v-if="conList.length > 0">
       <li v-for="(item,index) in conList" :key="item.id">
         <div style="margin-bottom: 10px;position: relative">
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -12,7 +12,7 @@
               <a-select-option v-for="(item, key) in tagList"
                                :key="key"
                                :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.problemLabel ">
+                     <span class="selectText" :title=" item.problemLabel ">
                            {{ item.problemLabel}}
                      </span>
               </a-select-option>
@@ -20,10 +20,10 @@
           </div>
           <div class="text-left-select">
             <span class="text-sel" :title="$t('market')">{{$t('market')}}</span>
-            <j-dict-select-tag class="text-select" v-model="queryParamOne.target_market"
-                               :placeholder="$t('PleaseSelect')+$t('market')"
-                               :type="'select'"
-                               :triggerChange="false" :dictCode="'region'"/>
+            <j-multi-select-tag class="text-select" v-model="queryParamOne.target_market"
+                                :placeholder="$t('PleaseSelect')+$t('market')"
+                                :type="'select'"
+                                :triggerChange="false" :dictCode="'region'"/>
           </div>
         </div>
         <div class="table-page-search-submitButtons submitButtons">
@@ -41,8 +41,8 @@
             </div>
           </div>
           <div class="box-content">
-            <a-checkbox-group v-model="checkboxText">
-              <li v-for="item in conList" :key="item.id">
+            <a-checkbox-group style="width: 100%" v-model="checkboxText">
+              <div v-for="item in conList" :key="item.id">
                 <div style="margin-bottom: 10px;position: relative">
                   <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
                   <div class="text-text-right"
@@ -53,20 +53,22 @@
                         <template slot="title">
                           <span v-html="item.title"></span>
                         </template>
-                        <span style="cursor: pointer" v-html="item.title"></span>
+                        <div class="text-header-text" style="cursor: pointer" v-html="item.title">
+
+                        </div>
                       </a-tooltip>
                     </div>
-<!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">-->
-<!--                      <template slot="title">-->
-<!--                        <span v-html="item.content"></span>-->
-<!--                      </template>-->
-                      <div class="text-content" v-html="item.content"
-                      >
-                      </div>
-<!--                    </a-tooltip>-->
+                    <!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">-->
+                    <!--                      <template slot="title">-->
+                    <!--                        <span v-html="item.content"></span>-->
+                    <!--                      </template>-->
+                    <div class="text-content" v-html="item.content"
+                    >
+                    </div>
+                    <!--                    </a-tooltip>-->
                   </div>
                 </div>
-              </li>
+              </div>
             </a-checkbox-group>
           </div>
           <div class="page">
@@ -243,6 +245,7 @@
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
                 val.content = val.content.replace(/<img .*?>/g, '')
+                val.content = val.content.replace(/<\/?p[^>]*>/gi, '')
               })
             }
             this.total = res.result.total
@@ -435,16 +438,17 @@
 
   .text-header {
     margin-bottom: 11px;
+    width: 100%;
 
-    span {
+    .text-header-text {
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
-      display: inline-block;
       width: 100%;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
+      word-break: break-word;
     }
   }
 
@@ -489,8 +493,18 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
-  ::v-deep p{
+
+  ::v-deep p {
     margin: 0;
     padding: 0;
   }
+
+   .selectText {
+    width: 100%;
+     display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    word-break: break-word;
+  }
 </style>

jero-web/src/views/documentTools/searchCenter/components/whole.vue

@@ -219,6 +219,7 @@
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
                 val.content = val.content.replace(/<img .*?>/g, '')
+                val.content = val.content.replace(/<\/?p[^>]*>/gi,'')
               })
             }
             this.total = res.result.total

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

@@ -199,7 +199,8 @@
     >
       <a-row :gutter="24">
         <a-col :span="24">
-          <span style='font-size: 16px;margin-bottom: 20px;display: flex;justify-content: center'' v-for='(item,key) in NotSelectedNoEngineerValue'>
+          <span style='font-size: 16px;margin-bottom: 20px;display: flex;justify-content: center'
+                v-for='(item,key) in NotSelectedNoEngineerValue'>
             <span v-html='item'></span>
           </span>
         </a-col>