合并分支 'dev_third_stage' 到 'master'

Dev third stage

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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3550,7 +3550,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        List records = infoPage.getRecords();
         List records = bussDocumentLibraryEOMapper.ocrPageInfo(field, conditionSb.toString());
         page.setTotal(records.size());
-        records = records.subList(pageNo * pageSize - pageSize, pageNo * pageSize);
+
+        int subSize = pageSize; // 每页记录数
+        int subCount = records.size(); // 总记录数
+        int subPageTotal = (subCount / subSize) + ((subCount % subSize > 0) ? 1 : 0); //总页数
+
+        // 分页计算
+        int fromIndex = (pageNo-1) * subSize;
+        int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize));
+        if( fromIndex <= subCount && toIndex <= subCount) {
+            records = records.subList(fromIndex, toIndex);
+        } else {
+            records = new ArrayList();
+        }
+
 
         //数据字典
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java

@@ -113,7 +113,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
         removeByIds(ids);
 
         QueryWrapper deleteWrapper = new QueryWrapper();
-		deleteWrapper.lambda().in("laws_opinion_gather_id",ids);
+		deleteWrapper.in("laws_opinion_gather_id",ids);
         this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -140,7 +140,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
         removeByIds(ids);
 
         QueryWrapper deleteWrapper = new QueryWrapper();
-		deleteWrapper.lambda().in("laws_technology_evaluation_id",ids);
+		deleteWrapper.in("laws_technology_evaluation_id",ids);
         this.lawsTechnologyEvaluationFlowDetailEOService.remove(deleteWrapper);
 
         this.lawsTechnologyEvaluationItemResultEOService.remove(deleteWrapper);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -887,7 +887,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		//生成页眉页脚
 		WordUtil.exportHeardAndFoot(document,moth);
 		//生成标题
-		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18,
+		WordUtil.exportWord(document, "\r\n\r\n\r\n", null, ParagraphAlignment.CENTER, 0, 18,
 				false, true, "Blue Sky Noto Regular",null);
 		int oneCount = 1;
 

jero-web/src/components/SplitTable/index.vue

@@ -134,11 +134,15 @@
         this.getData()
         this.getTableList()
       })
+      if (this.$route.query.serial_number) {
+        this.searchParmes.serialNumber = this.$route.query.serial_number
+        this.searchParmes = { ...this.searchParmes }
+      }
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()
     },
-    beforeDestroy(){
+    beforeDestroy() {
       eventBUs.$off('searchQuery')
       eventBUs.$off('searchReset')
       eventBUs.$off('searchGetData')

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

@@ -234,6 +234,10 @@
           placeholder: '',
           theme: 'snow', // or 'bubble'
           modules: {
+            clipboard: {
+              // 粘贴版，处理粘贴时候带图片
+              matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]],
+            },
             toolbar: {
               container: toolbarOptions, // 工具栏
               handlers: {
@@ -338,6 +342,18 @@
       quilleditorBlur() {
         this.$refs.ruleForm.validateField('content')
       },
+      handleCustomMatcher(node, Delta) {
+        let ops = []
+        Delta.ops.forEach(op => {
+          if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加
+            ops.push({
+              insert: op.insert,
+            })
+          }
+        })
+        Delta.ops = ops
+        return Delta
+      },
       getBase() {
         getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => {
           if (res.success) {

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -21,20 +21,23 @@
             <a-icon type="reload"/>
             {{$t('UpdateLog')}}
           </div>
-          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text"
+          <div @click="DocumentSplitting" v-has="'bussLog:splitting'" class="operator-text-text"
                :title="$t('DocumentSplitting')">
             <a-icon type="codepen"/>
             {{$t('DocumentSplitting')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentTranslation')">
+          <div @click="DocumentTranslationClick" v-has="'bussLog:translation'" class="operator-text-text"
+               :title="$t('DocumentTranslation')">
             <a-icon type="file-pdf"/>
             {{$t('DocumentTranslation')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentComparison')">
+          <div @click="DocumentComparisonClick" v-has="'bussLog:comparison'" class="operator-text-text"
+               :title="$t('DocumentComparison')">
             <a-icon type="wallet"/>
             {{$t('DocumentComparison')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('KnowledgeDatabase')">
+          <div @click="KnowledgeDatabaseClick" v-has="'bussLog:database'" class="operator-text-text"
+               :title="$t('KnowledgeDatabase')">
             <a-icon type="folder"/>
             {{$t('KnowledgeDatabase')}}
           </div>
@@ -357,6 +360,46 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      DocumentTranslationClick() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
+        let newUrl = this.$router.resolve({
+          path: '/documentTranslation',
+          query: {
+            serial_number: serial_number
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      DocumentComparisonClick() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
+        let newUrl = this.$router.resolve({
+          path: '/documentComparison',
+          query: {
+            serial_number: serial_number
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      KnowledgeDatabaseClick() {
+        let newUrl = this.$router.resolve({
+          path: '/problemknowledgeBase',
+        })
+        window.open(newUrl.href, '_blank')
+      },
       getTitle(callback) {
         let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
         getAction(this.url.getTitle, { id: _id }).then((res) => {
@@ -459,10 +502,18 @@
         this.bussLogList()
       },
       DocumentSplitting() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
         let newUrl = this.$router.resolve({
           path: '/docManage/splite',
           query: {
-            serial_number: this.$route.query.serial_number
+            serial_number: serial_number
           }
         })
         window.open(newUrl.href, '_blank')
@@ -539,7 +590,7 @@
         }
 
         .doc-detail-right {
-          width: 800px;
+          /*width: 800px;*/
           line-height: 68px;
           display: flex;
 
@@ -642,7 +693,7 @@
     font-weight: 400;
     color: #040B29;
     display: inline-block;
-    width: 20%;
+    width: 100px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;

jero-web/src/views/documentManage/splitting/index.vue

@@ -137,7 +137,7 @@
 
     },
     mounted() {
-      if (this.$route.query.serial_number !== undefined) {
+      if (this.$route.query.serial_number) {
         this.serialnumber = this.$route.query.serial_number
       }
     },

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -220,6 +220,10 @@
       }
     },
     mounted() {
+      if (this.$route.query.serial_number) {
+        this.queryParam.serialNumber = this.$route.query.serial_number
+        this.queryParam = { ...this.queryParam }
+      }
       this.userInfoQuery = this.userInfo()
       this.getList()
     },

jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue

@@ -85,16 +85,16 @@
         this.loadingRight = true
         // this.readExcelFromRemoteFileLeft(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
         // this.readExcelFromRemoteFileRight(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-        let href = location.href.slice(0, 5)
-        if (href.indexOf('s') == '-1') {
+        // let href = location.href.slice(0, 5)
+        // if (href.indexOf('s') == '-1') {
           this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
           this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-          console.log(this.detailUrlLeft)
-        } else {
-          this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
-          this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-          console.log(this.detailUrlLeft)
-        }
+          // console.log(this.detailUrlLeft)
+        // } else {
+        //   this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
+        //   this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
+        //   console.log(this.detailUrlLeft)
+        // }
       },
       readExcelFromRemoteFileLeft: function(url) {
         var vm = this

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -227,6 +227,10 @@
       }
     },
     mounted() {
+      if (this.$route.query.serial_number) {
+        this.queryParam.serialNumber = this.$route.query.serial_number
+        this.queryParam = { ...this.queryParam }
+      }
       this.getList()
       this.userInfoQuery = this.userInfo()
     },
@@ -455,12 +459,13 @@
     margin-right: 4px;
     display: inline-block;
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>