From 743e54d665a6a8970f47b1d558cb61041f7a2fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 16 Sep 2022 09:07:39 +0800
Subject: [PATCH 01/10] =?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=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseAdd.vue    | 50 +++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 43db4bdfb..19fc8f1ff 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -195,6 +195,7 @@
   import { quillEditor } from 'vue-quill-editor'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import axios from 'axios'
 
   const toolbarOptions = [
     ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
@@ -236,7 +237,7 @@
           modules: {
             clipboard: {
               // 粘贴版，处理粘贴时候带图片
-              matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]],
+              matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]]
             },
             toolbar: {
               container: toolbarOptions, // 工具栏
@@ -337,6 +338,49 @@
       } else {
         document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
       }
+      let quill = this.$refs.myQuillEditor.quill
+      this.$forceUpdate()
+      quill.root.addEventListener(
+        'paste',
+        (evt) => {
+          if (
+            evt.clipboardData &&
+            evt.clipboardData.files &&
+            evt.clipboardData.files.length
+          ) {
+            evt.preventDefault();
+            [].forEach.call(evt.clipboardData.files, (file) => {
+              if (!file.type.match(/^image\/(gif|jpe?g|a?png|bmp)/i)) {
+                return
+              }
+              const formData = new FormData()
+              formData.append('file', file)
+              axios({
+                url: this.uploadAction,
+                method: 'post',
+                data: formData,
+                headers: {
+                  'Content-Type': 'multipart/form-data',
+                  'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)
+                }
+              })
+                .then((res) => {
+                  if (res.data.success){
+                    let quill = this.$refs.myQuillEditor.quill
+                    let length = quill.getSelection().index
+                    let fileName = res.data.result.fileName
+                    let index1 = fileName.lastIndexOf('.')
+                    let index2 = fileName.length
+                    let fileSuffix = fileName.substring(index1, index2)
+                    quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix)
+                    quill.setSelection(length + 1)
+                  }
+                })
+            })
+          }
+        },
+        false
+      )
     },
     methods: {
       quilleditorBlur() {
@@ -347,7 +391,7 @@
         Delta.ops.forEach(op => {
           if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加
             ops.push({
-              insert: op.insert,
+              insert: op.insert
             })
           }
         })
@@ -461,7 +505,7 @@
           let index1 = fileName.lastIndexOf('.')
           let index2 = fileName.length
           let fileSuffix = fileName.substring(index1, index2)
-          quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL']+'/sys/common/download/'+file.response.result.id+fileSuffix)
+          quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix)
           quill.setSelection(length + 1)
           this.quillUpdateImg = false
         } else if (status === 'uploading') {

From ea74da2a7f4b82ba07a41aff3178133843f6e050 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 16 Sep 2022 09:27:17 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86standId(=E7=94=A8=E4=BA=8E=E7=82=B9=E5=87=BB=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7=E8=B7=B3=E8=BD=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 3a560b016..58d92b7c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -6164,7 +6164,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区
 				projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期
 				projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期
-				projectLawsInventoryEO.setStandId(collect.get(0).getId());//新车实施日期
+				projectLawsInventoryEO.setStandId(collect.get(0).getId());
+			}
+		}else{
+			//导入列表数据处理standId(用于点击标准号跳转)
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+				List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
+						.filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList());
+				projectLawsInventoryEO.setStandId(collect.get(0).getId());
 			}
 		}
 	}

From 72c17268246de52c290f07b72725486556249fa3 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 16 Sep 2022 09:31:13 +0800
Subject: [PATCH 03/10] =?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=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseAdd.vue    | 64 +++++++++----------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 19fc8f1ff..f292d6cb9 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -227,10 +227,9 @@
     data() {
       return {
         formInline: {},
+        loading: false,
         headers: '',
         uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
-        loading: false,
-        problemTypeList: [],
         editorOption: { // 富文本框配置
           placeholder: '',
           theme: 'snow', // or 'bubble'
@@ -253,6 +252,7 @@
             }
           }
         },
+        problemTypeList: [],
         rules: {
           showPermissions: [
             {
@@ -308,6 +308,7 @@
         },
         isDisplay: false,
         disabled: false,
+        content: '<h2>I am Example</h2>'
         projectNameList: [
           {
             value: 'Open',
@@ -318,26 +319,19 @@
             name: this.$t('Privacy')
           }
         ],
-        content: '<h2>I am Example</h2>'
       }
     },
-    created() {
-      const token = Vue.ls.get(ACCESS_TOKEN)
-      this.headers = { 'X-Access-Token': token }
-    },
     computed: {
       editor() {
         return this.$refs.myQuillEditor.quill
       }
     },
+    created() {
+      const token = Vue.ls.get(ACCESS_TOKEN)
+      this.headers = { 'X-Access-Token': token }
+    },
     mounted() {
       this.getBase()
-      if (this.$route.query.id) {
-        this.queryById()
-        document.title = this.$t('problemKnowledgeBase') + this.$t('edit')
-      } else {
-        document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
-      }
       let quill = this.$refs.myQuillEditor.quill
       this.$forceUpdate()
       quill.root.addEventListener(
@@ -381,11 +375,14 @@
         },
         false
       )
+      if (this.$route.query.id) {
+        this.queryById()
+        document.title = this.$t('problemKnowledgeBase') + this.$t('edit')
+      } else {
+        document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
+      }
     },
     methods: {
-      quilleditorBlur() {
-        this.$refs.ruleForm.validateField('content')
-      },
       handleCustomMatcher(node, Delta) {
         let ops = []
         Delta.ops.forEach(op => {
@@ -398,6 +395,9 @@
         Delta.ops = ops
         return Delta
       },
+      quilleditorBlur() {
+        this.$refs.ruleForm.validateField('content')
+      },
       getBase() {
         getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => {
           if (res.success) {
@@ -460,39 +460,28 @@
       ,
       onEditorFocus(quill) {
         console.log('editor focus!', quill)
-      }
-      ,
+      },
       onEditorReady(quill) {
         console.log('editor ready!', quill)
-      }
-      ,
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
       onEditorChange({ quill, html, text }) {
         console.log(html)
         console.log(quill)
         console.log(text)
         this.formInline.content = html
-      }
-      ,
-      PersonnelSelectionChange(value, id) {
-        this.formInline[value] = id
-        this.formInline = { ...this.formInline }
-      }
-      ,
+      },
       handleInput(value) {
         this.$nextTick(() => {
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.validateField([value])
         })
-      }
-      ,
+      },
       bringInDocumentInformationClick() {
         this.$refs.listAddModelRef.addModel(this.formInline)
-      }
-      ,
-      listAddModelForm(id, number) {
-        this.formInline.standNumber = number
-        this.formInline.bussDocumentLibraryId = id
-        this.formInline = { ...this.formInline }
       },
       handleChange(info) {
         let { file } = info
@@ -512,6 +501,11 @@
 
         }
       },
+      listAddModelForm(id, number) {
+        this.formInline.standNumber = number
+        this.formInline.bussDocumentLibraryId = id
+        this.formInline = { ...this.formInline }
+      },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true

From 650d7006f4db994f3a2eb841e6d3d1a6a3e92d61 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 16 Sep 2022 09:39:20 +0800
Subject: [PATCH 04/10] =?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=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseAdd.vue    | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index f292d6cb9..b36a85902 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -308,7 +308,7 @@
         },
         isDisplay: false,
         disabled: false,
-        content: '<h2>I am Example</h2>'
+        content: '<h2>I am Example</h2>',
         projectNameList: [
           {
             value: 'Open',
@@ -318,7 +318,7 @@
             value: 'Privacy',
             name: this.$t('Privacy')
           }
-        ],
+        ]
       }
     },
     computed: {
@@ -359,7 +359,7 @@
                 }
               })
                 .then((res) => {
-                  if (res.data.success){
+                  if (res.data.success) {
                     let quill = this.$refs.myQuillEditor.quill
                     let length = quill.getSelection().index
                     let fileName = res.data.result.fileName
@@ -444,20 +444,17 @@
       },
       backClick() {
         this.$router.go(-1)
-      }
-      ,
+      },
       showPermissionsChange(event, name) {
         if (event == 'Open') {
           this.isDisplay = false
         } else {
           this.isDisplay = true
         }
-      }
-      ,
+      },
       onEditorBlur(quill) {
         console.log('editor blur!', quill)
-      }
-      ,
+      },
       onEditorFocus(quill) {
         console.log('editor focus!', quill)
       },
@@ -517,8 +514,7 @@
             this.$refs.uploadFile.perentHandleFunc()
           }
         })
-      }
-      ,
+      },
       /** 上传文件的回调 */
       uploadSuccess(data) {
         let attIdList = []
@@ -530,8 +526,7 @@
         /** 赋值给当前对应的表单文件 */
         this.formInline[this.uploadName] = attIdList.join(',')
         this.formInline = { ...this.formInline }
-      }
-      ,
+      },
       submit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {

From 84362ef72ffcf3eb7cfb6b4f2273c02a36b903a1 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 16 Sep 2022 12:52:09 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4:=20=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero-boot-module-certification/pom.xml    |  20 ---
 .../ParamsCollectManifestEOController.java    |   0
 ...amsCollectManifestHistoryEOController.java |   0
 ...ollectManifestUserTypeLogEOController.java |   9 -
 .../ParamsConfigDataEOController.java         |   0
 .../controller/ParamsConfigEOController.java  |   0
 .../ParamsManifestEOController.java           |   0
 ...lsStatisticsCollectManifestController.java |   0
 .../entity/ParamsCollectManifestBaseEO.java   |   0
 .../entity/ParamsCollectManifestEO.java       |   4 -
 .../ParamsCollectManifestHistoryEO.java       |   1 -
 .../ParamsCollectManifestUserTypeLogEO.java   |   0
 .../collect/entity/ParamsConfigDataEO.java    |   0
 .../entity/ParamsConfigDataHistoryEO.java     |   0
 .../cert/collect/entity/ParamsConfigEO.java   |   0
 .../collect/entity/ParamsConfigHistoryEO.java |   0
 .../cert/collect/entity/ParamsManifestEO.java |   0
 .../entity/ParamsManifestHistoryEO.java       |   0
 .../enums/CollectManifestChangeFlagEnum.java  |   0
 .../enums/CollectManifestRoleIdEnum.java      |   3 -
 .../enums/CollectManifestStateEnum.java       |   0
 .../CollectManifestStatisticsStateEnum.java   |   0
 .../enums/CollectManifestUserTypeEnum.java    |   0
 .../collect/enums/ConfigDataTypeEnum.java     |   0
 .../cert/collect/enums/ConfigLockEnum.java    |   0
 .../cert/collect/enums/ManifestStateEnum.java |   1 -
 .../mapper/ParamsCollectManifestEOMapper.java |   0
 .../ParamsCollectManifestHistoryEOMapper.java |   0
 ...amsCollectManifestUserTypeLogEOMapper.java |   3 -
 .../mapper/ParamsConfigDataEOMapper.java      |   0
 .../ParamsConfigDataHistoryEOMapper.java      |   0
 .../collect/mapper/ParamsConfigEOMapper.java  |   0
 .../mapper/ParamsConfigHistoryEOMapper.java   |   3 -
 .../mapper/ParamsManifestEOMapper.java        |   0
 .../mapper/ParamsManifestHistoryEOMapper.java |   0
 .../xml/ParamsCollectManifestEOMapper.xml     |   0
 .../ParamsCollectManifestHistoryEOMapper.xml  |   0
 ...ramsCollectManifestUserTypeLogEOMapper.xml |   0
 .../mapper/xml/ParamsConfigDataEOMapper.xml   |   0
 .../xml/ParamsConfigDataHistoryEOMapper.xml   |   0
 .../mapper/xml/ParamsConfigEOMapper.xml       |   0
 .../xml/ParamsConfigHistoryEOMapper.xml       |   0
 .../mapper/xml/ParamsManifestEOMapper.xml     |   0
 .../xml/ParamsManifestHistoryEOMapper.xml     |   0
 .../IParamsCollectManifestEOService.java      |   0
 ...ParamsCollectManifestHistoryEOService.java |   0
 ...msCollectManifestUserTypeLogEOService.java |   0
 .../service/IParamsConfigDataEOService.java   |   0
 .../IParamsConfigDataHistoryEOService.java    |   0
 .../service/IParamsConfigEOService.java       |   0
 .../IParamsConfigHistoryEOService.java        |   0
 .../service/IParamsManifestEOService.java     |   7 +
 .../IParamsManifestHistoryEOService.java      |   0
 .../ParamsCollectManifestEOServiceImpl.java   |   0
 ...msCollectManifestHistoryEOServiceImpl.java |   0
 ...llectManifestUserTypeLogEOServiceImpl.java |   0
 .../impl/ParamsConfigDataEOServiceImpl.java   |   0
 .../ParamsConfigDataHistoryEOServiceImpl.java |   0
 .../impl/ParamsConfigEOServiceImpl.java       |   0
 .../ParamsConfigHistoryEOServiceImpl.java     |   0
 .../impl/ParamsManifestEOServiceImpl.java     |  41 +++++
 .../ParamsManifestHistoryEOServiceImpl.java   |   0
 .../collect/vo/ParamsCollectManifestVO.java   |   0
 .../cert/collect/vo/ParamsConfigDataVO.java   |   0
 .../cert/collect/vo/ParamsConfigVO.java       |   0
 .../collect/vo/ParamsManifestHistoryVO.java   |   0
 .../cert/collect/vo/ParamsManifestVO.java     |   0
 .../ParamsExportTemplateEOController.java     |   0
 .../ParamsReportDetailEOController.java       |   0
 .../controller/ParamsReportEOController.java  |   0
 ...ortCertCategoryParamsInfoEOController.java |   0
 .../report/entity/ParamsExportTemplateEO.java |   0
 .../entity/ParamsReportConfigDataEO.java      |   0
 .../report/entity/ParamsReportConfigEO.java   |   0
 .../report/entity/ParamsReportDetailEO.java   |   2 -
 .../cert/report/entity/ParamsReportEO.java    |   0
 .../entity/ParamsReportExportHistoryEO.java   |   0
 .../ReportCertCategoryParamsInfoEO.java       |   0
 .../report/enums/ExportTemplateStateEnum.java |   0
 .../cert/report/enums/ExportTypeEnum.java     |   0
 .../mapper/ParamsExportTemplateEOMapper.java  |   0
 .../ParamsReportConfigDataEOMapper.java       |   0
 .../mapper/ParamsReportConfigEOMapper.java    |   0
 .../mapper/ParamsReportDetailEOMapper.java    |   1 -
 .../report/mapper/ParamsReportEOMapper.java   |   0
 .../ParamsReportExportHistoryEOMapper.java    |   2 -
 .../ReportCertCategoryParamsInfoEOMapper.java |   0
 .../xml/ParamsExportTemplateEOMapper.xml      |   0
 .../xml/ParamsReportConfigDataEOMapper.xml    |   0
 .../mapper/xml/ParamsReportConfigEOMapper.xml |   0
 .../mapper/xml/ParamsReportDetailEOMapper.xml |   0
 .../mapper/xml/ParamsReportEOMapper.xml       |   0
 .../xml/ParamsReportExportHistoryEOMapper.xml |   0
 .../ReportCertCategoryParamsInfoEOMapper.xml  |   0
 .../IParamsExportTemplateEOService.java       |   0
 .../IParamsReportConfigDataEOService.java     |   0
 .../service/IParamsReportConfigEOService.java |   0
 .../service/IParamsReportDetailEOService.java |   0
 .../service/IParamsReportEOService.java       |   0
 .../IParamsReportExportHistoryEOService.java  |   0
 ...ReportCertCategoryParamsInfoEOService.java |   0
 .../ParamsExportTemplateEOServiceImpl.java    |   0
 .../ParamsReportConfigDataEOServiceImpl.java  |   0
 .../impl/ParamsReportConfigEOServiceImpl.java |   0
 .../impl/ParamsReportDetailEOServiceImpl.java |   0
 .../impl/ParamsReportEOServiceImpl.java       |  20 +--
 ...aramsReportExportHistoryEOServiceImpl.java |   0
 ...rtCertCategoryParamsInfoEOServiceImpl.java |   0
 .../modules/cert/report/util/Docx4jUtil.java  | 164 +++++++++++++++++-
 .../cert/report/vo/ParamsReportDetailVO.java  |   0
 .../CertCategoryParamsInfoEOController.java   |   0
 .../controller/ParamsInfoEOController.java    |   1 -
 .../ParamsTemplateEOController.java           |   0
 .../entity/CertCategoryParamsInfoEO.java      |   0
 .../CertCategoryParamsInfoPublishEO.java      |   5 -
 .../cert/template/entity/ParamsInfoEO.java    |   0
 .../template/entity/ParamsInfoPublishEO.java  |   0
 .../template/entity/ParamsTemplateEO.java     |   0
 .../cert/template/enums/ControlTypeEnum.java  |   0
 .../template/enums/ControlVerifyEnum.java     |   0
 .../cert/template/enums/ParamsIsMustEnum.java |   0
 .../CertCategoryParamsInfoEOMapper.java       |   0
 ...CertCategoryParamsInfoPublishEOMapper.java |   0
 .../template/mapper/ParamsInfoEOMapper.java   |   0
 .../mapper/ParamsInfoPublishEOMapper.java     |   0
 .../mapper/ParamsTemplateEOMapper.java        |   0
 .../xml/CertCategoryParamsInfoEOMapper.xml    |   0
 .../CertCategoryParamsInfoPublishEOMapper.xml |   0
 .../mapper/xml/ParamsInfoEOMapper.xml         |   0
 .../mapper/xml/ParamsInfoPublishEOMapper.xml  |   0
 .../mapper/xml/ParamsTemplateEOMapper.xml     |   0
 .../ICertCategoryParamsInfoEOService.java     |   0
 ...ertCategoryParamsInfoPublishEOService.java |   0
 .../service/IParamsInfoEOService.java         |   0
 .../service/IParamsInfoPublishEOService.java  |   0
 .../service/IParamsTemplateEOService.java     |   0
 .../CertCategoryParamsInfoEOServiceImpl.java  |   0
 ...ategoryParamsInfoPublishEOServiceImpl.java |   0
 .../service/impl/ParamsInfoEOServiceImpl.java |   0
 .../impl/ParamsInfoPublishEOServiceImpl.java  |   0
 .../impl/ParamsTemplateEOServiceImpl.java     |   0
 .../utils/CommonExcelExportStyler.java        |   0
 .../vo/CertCategoryParamsInfoCnImport.java    |   0
 .../vo/CertCategoryParamsInfoEnExport.java    |   0
 .../vo/CertCategoryParamsInfoEnImport.java    |   0
 .../cert/template/vo/ParamsInfoCnImport.java  |   0
 .../cert/template/vo/ParamsInfoEnExport.java  |   0
 .../cert/template/vo/ParamsInfoEnImport.java  |   0
 .../cert/template/vo/ParamsInfoVO.java        |   0
 .../impl/ProjectLibraryBaseServiceImpl.java   |  39 ++---
 jero-boot/jero-boot-single-startup/pom.xml    |   5 -
 jero-boot/pom.xml                             |   1 -
 152 files changed, 228 insertions(+), 104 deletions(-)
 delete mode 100644 jero-boot/jero-boot-module-certification/pom.xml
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java (85%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java (86%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java (92%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java (94%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java (96%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java (86%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java (84%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java (94%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java (95%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java (91%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java (93%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java (96%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java (90%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java (71%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java (99%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java (77%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java (100%)
 rename jero-boot/{jero-boot-module-certification => jero-boot-modules}/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java (100%)

diff --git a/jero-boot/jero-boot-module-certification/pom.xml b/jero-boot/jero-boot-module-certification/pom.xml
deleted file mode 100644
index 67ea7212d..000000000
--- a/jero-boot/jero-boot-module-certification/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.jero.boot</groupId>
-        <artifactId>jero-boot</artifactId>
-        <version>2.4.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>jero-boot-module-certification</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.jero.boot</groupId>
-            <artifactId>jero-boot-modules</artifactId>
-            <version>${jero.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
similarity index 85%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
index 884aa0fb7..af2693408 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
@@ -1,22 +1,13 @@
 package com.jero.modules.cert.collect.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
similarity index 86%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
index 5e48be132..6b38ec36e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
@@ -1,17 +1,13 @@
 package com.jero.modules.cert.collect.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
similarity index 92%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
index b84bf7069..223acf2b3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.io.Serializable;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java
similarity index 94%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java
index cad81c249..dd9af84ba 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java
@@ -1,11 +1,8 @@
 package com.jero.modules.cert.collect.enums;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.split.enums.StandFileClassifyEnum;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
similarity index 96%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
index e62add4e9..5567d804e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
@@ -1,7 +1,6 @@
 package com.jero.modules.cert.collect.enums;
 
 import com.jero.common.constant.enums.CutEnum;
-import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
similarity index 86%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
index 578169942..62a0c257d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java
similarity index 84%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java
index 67adecaee..899896d78 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java
@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
similarity index 94%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
index cbfd3c68c..97f7fce4d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
@@ -51,6 +51,13 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 	 */
     boolean deleteByIds(List<String> ids, String cut);
 
+	/**
+	 * 删除项目下的所有收集清单
+	 * @param projectId
+	 * @return
+	 */
+    boolean deleteByProjectId(String projectId);
+
 	/**
 	 * 通过id查询
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
similarity index 95%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index c9a7c110a..7ebdaab76 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -282,6 +282,47 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
         return removeByIds(ids);
     }
 
+	/**
+	 * 删除项目下的所有收集清单
+	 *
+	 * @param projectId
+	 * @return
+	 */
+	@Override
+    public boolean deleteByProjectId(String projectId) {
+		// 查询项目下的所有清单
+		LambdaQueryWrapper<ParamsManifestEO> manifestEOQueryWrapper = new LambdaQueryWrapper<>();
+		manifestEOQueryWrapper.eq(ParamsManifestEO :: getProjectId, projectId);
+		List<ParamsManifestEO> paramsManifestEOList = list(manifestEOQueryWrapper);
+		List<String> ids = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			ids = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
+
+			// 关联删除配置
+			LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
+			configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+			paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+			// 关联删除收集的参数项（包含配置数据）
+			LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+			List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+				List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+				paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+			}
+
+			// 删除对应的历史版本数据
+			paramsManifestHistoryEOService.deleteAllHistoryVersion(ids);
+
+			// 添加上报库的项目名称和清单标题
+			paramsReportEOService.setProjectNameAndTitle(ids);
+
+		}
+		return removeByIds(ids);
+    }
+
 	/**
 	 * 通过id查询
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
similarity index 91%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
index 8c5168c7f..cba41a0d0 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
@@ -1,10 +1,8 @@
 package com.jero.modules.cert.report.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
similarity index 93%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
index 53781f175..9953f73a4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
@@ -2,7 +2,6 @@ package com.jero.modules.cert.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import org.apache.ibatis.annotations.Param;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
similarity index 96%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
index 0cf024066..6f27b2f37 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
@@ -1,7 +1,5 @@
 package com.jero.modules.cert.report.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
similarity index 90%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
index a3d285a7a..0f7cdafa6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
@@ -167,28 +167,26 @@ public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper,
 
 		List<ParamsManifestVO>  paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList);
 		List<String> paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList());
-		List<Integer> paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList());
 
 		LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList)
-				.in(ParamsReportEO::getVersion, paramsManifestVersionList);
+		queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList);
 		List<ParamsReportEO> paramsReportEOList = list(queryWrapper);
 
 		paramsManifestEOList.forEach(paramsManifestVO -> {
 
 			List<ParamsReportEO> paramsReportEOS = paramsReportEOList.stream()
-					.filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion()))
+					.filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()))
 					.collect(Collectors.toList());
 
 			if (CollectionUtil.isNotEmpty(paramsReportEOS)) {
-				ParamsReportEO paramsReportEO = paramsReportEOS.get(0);
+				for (ParamsReportEO paramsReportEO : paramsReportEOS) {
+					ParamsReportEO updateEO = new ParamsReportEO();
+					updateEO.setId(paramsReportEO.getId());
+					updateEO.setTitle(paramsManifestVO.getTitle());
+					updateEO.setProjectName(paramsManifestVO.getProjectName());
 
-				ParamsReportEO updateEO = new ParamsReportEO();
-				updateEO.setId(paramsReportEO.getId());
-				updateEO.setTitle(paramsManifestVO.getTitle());
-				updateEO.setProjectName(paramsManifestVO.getProjectName());
-
-				updateEOList.add(updateEO);
+					updateEOList.add(updateEO);
+				}
 			}
 
 		});
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
similarity index 71%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
index e034dc69b..59f2afb6f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
@@ -1,7 +1,10 @@
 package com.jero.modules.cert.report.util;
 
+import com.jero.modules.project.util.WordUtil;
+import org.docx4j.Docx4J;
 import org.docx4j.XmlUtils;
 import org.docx4j.dml.wordprocessingDrawing.Inline;
+import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
@@ -9,15 +12,138 @@ import org.docx4j.wml.*;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class Docx4jUtil {
+    public static void main(String[] args) {
+
+//        try {
+//            String file1 = "C:\\Users\\lyw\\Desktop\\测试文件\\新建文件夹\\7-1.jpg";
+//            String file2 = "C:\\Users\\lyw\\Desktop\\测试文件\\7-1.jpg";
+//
+//            boolean result = compareFileContent(file1, file2);
+//
+//            System.out.println(result);
+////            FileInputStream fileInputStream = new FileInputStream("D:\\text\\文档6.doc");
+////            WordExtractor ex = new WordExtractor(fileInputStream);
+////            String str = ex.getText();
+////            System.out.println(str);
+//        } catch (Exception e){
+//
+//            System.out.println("error");
+//        }
+
+//        Map<String, String> params = new HashMap<String, String>();
+//        params.put("NIO/07200101", "java开发");
+//        params.put("NIO-07200102", "焦糖橙#子");
+//        params.put("NIO.07200103", "男1");
+//        params.put("NIO07-20 01/04.00", "8888@csdn.com1");
+//        // 替换占位符内容
+//        try {
+//
+//            List<Map<String, Object>> picList = new ArrayList<>();
+//            Map<String, Object> picMap1 = new HashMap<>();
+//            picMap1.put("key", "NIO 07200103");
+//            picMap1.put("text", "");
+//            picMap1.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true));
+//
+//            Map<String, Object> picMap2 = new HashMap<>();
+//            picMap2.put("key", "NIO07-20 01/04");
+//            picMap2.put("text", "wok#wwokwo");
+//            picMap2.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true));
+//
+//            picList.add(picMap1);
+//            picList.add(picMap2);
+//
+//            String str = picList.stream().filter(e->e.get("text").equals("lalala")).map(e -> (String)e.get("key")).collect(Collectors.joining(","));
+//            System.out.println(str);
+////            File file  = new File("D:\\text\\080301自定义模板.xlsx");
+////            SpreadsheetMLPackage pkg = SpreadsheetMLPackage.load(file);
+////            Workbook workbook = WorkbookFactory.create(file);
+////            ExcelUtil.replacePictureBatchPOI(workbook, pkg, picList, (HashMap<String, String>)params);
+////            ExcelUtil.variableReplace(pkg, (HashMap<String, String>) params);
+////            OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.xlsx");
+////            pkg.save(wordFileOS);
+//
+//            File file  = new File("D:\\text\\080301自定义模板.docx");
+//            WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(file));
+//            WordUtil.replacePictureBatch(wordMLPackage, picList);
+////            WordUtil.replaceVariable(wordMLPackage, params);
+//            OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx");
+//            Docx4J.save(wordMLPackage, wordFileOS);
+//
+////            byte[] wordContent =  Docx4jUtil.of("D:\\text\\myword.docx")
+////                    .addParams(params)
+//////    				.addImg("jpeg1", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true))
+////                    .get();
+////            ByteArrayInputStream wordis = new ByteArrayInputStream(wordContent);
+////            OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx");
+////            int len1 = 0;
+////            while ((len1 = wordis.read()) != -1) {
+////                wordFileOS.write(len1);
+////            }
+//            wordFileOS.flush();
+//            wordFileOS.close();
+//
+//            System.out.println("<-----生成结束----->");
+//        } catch (Docx4JException e) {
+//            e.printStackTrace();
+//        } catch (FileNotFoundException e) {
+//            e.printStackTrace();
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+
+        try {
+            String path = "C:\\Users\\lyw\\Desktop\\测试文件\\ComplianceReportTemplate (1).docx";
+//            String path1 = "C:\\Users\\lyw\\Desktop\\测试文件\\新建文档.docx";
+            String path1 = "C:\\Users\\lyw\\Desktop\\测试文件\\自定义导出模板加表格.docx";
+            String outpath = "C:\\Users\\lyw\\Desktop\\测试文件\\ComplianceReportTemplate (导出).docx";
+            WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(path1));
+//            WordUtil.replaceTable(path, 1, 2, dataList, outpath);
+//            WordUtil.replaceTable(wordMLPackage, dataList, outpath);
+//            WordUtil.getTableContent(wordMLPackage);
+
+            Map<String, String> param = new HashMap<String, String>();
+            param.put("NIO 00001", "焦糖橙#子");
+            param.put("NIO-00002", "alalalla");
+            param.put("123456", "bbbbb");
+            param.put("NIO-00023", "VVVV");
+
+            param.put("NIO-001", "焦糖橙#子");
+            param.put("NIO-002", "alalalla");
+            param.put("NIO-003", "bbbbb");
+            param.put("NIO-004", "VVVV");
+            param.put("NIO 07200101", "wakabakawakabaka");
+
+            List<Map<String, Object>> picList = new ArrayList<>();
+            Map<String, Object> picMap1 = new HashMap<>();
+            picMap1.put("key", "NIO-005");
+            picMap1.put("text", "XXXXX");
+            picMap1.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true));
+
+            Map<String, Object> picMap2 = new HashMap<>();
+            picMap2.put("key", "NIO-007");
+            picMap2.put("text", "wok#wwokwo");
+            picMap2.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true));
+
+            picList.add(picMap1);
+            picList.add(picMap2);
+
+            WordUtil.replacePictureBatch(wordMLPackage, picList);
+            WordUtil.replaceVariableWithOutClear(wordMLPackage, param);
+            OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx");
+            Docx4J.save(wordMLPackage, wordFileOS);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public static Builder Builder;
 
     public static Builder of(String path) throws FileNotFoundException, Docx4JException {
@@ -87,7 +213,7 @@ public class Docx4jUtil {
                 throws Docx4JException, JAXBException {
             List<Object> tables = getAllElementFromObject(template.getMainDocumentPart(), Tbl.class);
 
-            Tbl tempTable = getTemplateTable(tables, tablePlaceholder); //
+            Tbl tempTable = getTemplateTable(tables, tablePlaceholder);
             if (tempTable != null && list != null && !list.isEmpty()) {
                 List<Object> trs = getAllElementFromObject(tempTable, Tr.class);
                 int rows = trs.size();
@@ -249,6 +375,8 @@ public class Docx4jUtil {
             if (!params.isEmpty()) {
                 while (texts.hasNext()) {
                     Text text = texts.next();
+                    R r= (R) text.getParent();
+                    P p = (P) r.getParent();
                     String temp = text.getValue();
                     for (Map.Entry<String, String> param : params.entrySet()) {
                         if (temp.equals("${" + param.getKey() + "}")) {
@@ -303,6 +431,29 @@ public class Docx4jUtil {
         return inline;
     }
 
+    public static P newImageInline(WordprocessingMLPackage wordMLPackage, byte[] bytes,
+                                                  String filenameHint, String altText, int id1, int id2 , String text) throws Exception {
+
+        BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordMLPackage, bytes);
+        Inline inline = imagePart.createImageInline(filenameHint, altText, id1, id2, false);
+
+        // Now add the inline in w:p/w:r/w:drawing
+        ObjectFactory factory = Context.getWmlObjectFactory();
+        P p = factory.createP();
+        R run = factory.createR();
+        if(text != null){
+            Text txt = factory.createText();
+            txt.setValue(text);
+            run.getContent().add(txt);
+        }
+        p.getContent().add(run);
+        Drawing drawing = factory.createDrawing();
+        run.getContent().add(drawing);
+        drawing.getAnchorOrInline().add(inline);
+
+        return p;
+    }
+
     /**
      * 创建一个对象工厂并用它创建一个段落和一个可运行块R. 然后将可运行块添加到段落中. 接下来创建一个图画并将其添加到可运行块R中. 最后我们将内联
      * 对象添加到图画中并返回段落对象.
@@ -342,6 +493,7 @@ public class Docx4jUtil {
             }
         }
         return result;
+
     }
 
     // 发现docx文档中的节点
@@ -455,7 +607,7 @@ public class Docx4jUtil {
      */
     private static boolean isPlaceholder(String str) {
         if (str != null && !str.isEmpty()) {
-            Pattern pattern = Pattern.compile("([$]\\{\\w+\\})");
+            Pattern pattern = Pattern.compile("([$]\\{[A-Za-z0-9./ -]+\\})");
             Matcher m = pattern.matcher(str);
             return m.find();
         }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
similarity index 99%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index bad589083..ab39e0243 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -10,7 +10,6 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.template.entity.ParamsInfoEO;
-import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoEOService;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.vo.ParamsInfoVO;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java
similarity index 77%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java
index b3cf1ecff..1af5f32ce 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java
@@ -1,16 +1,11 @@
 package com.jero.modules.cert.template.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java
similarity index 100%
rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 688d9e05b..783666259 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -7,27 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.enums.DictCodeEnum;
-import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.project.entity.ProjectLawsInventoryEO;
-import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
-import com.jero.modules.project.entity.ProjectLibraryBase;
-import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
-import com.jero.modules.project.entity.ProjectRelatedPersonnel;
-import com.jero.modules.project.entity.ProjectTaskInventoryEO;
-import com.jero.modules.project.entity.ProjectTaskPlanning;
-import com.jero.modules.project.enums.CertificationProgressEnum;
-import com.jero.modules.project.enums.CurrentProjectStatusEnum;
-import com.jero.modules.project.enums.DesignComplianceStatusEnum;
-import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
-import com.jero.modules.project.enums.OperatorTypeEnum;
-import com.jero.modules.project.enums.ProjectRoleEnum;
-import com.jero.modules.project.enums.TaskAffirmStatusEnum;
-import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
-import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
-import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
-import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
-import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
+import com.jero.modules.project.entity.*;
+import com.jero.modules.project.enums.*;
+import com.jero.modules.project.mapper.*;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
@@ -52,12 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -111,6 +90,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
 
+	@Autowired
+	private IParamsManifestEOService paramsManifestEOService;
+
 	/**
 	 * 保存
 	 *
@@ -229,6 +211,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Override
 	public void deleteById(String id,String cut) {
 		checkData(id,cut);
+
+		// 关联删除项目下的所有收集清单
+		paramsManifestEOService.deleteByProjectId(id);
+
 		removeById(id);
 
 		//关联删除-相关人员
@@ -250,6 +236,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		QueryWrapper<ProjectLawsInventoryLogEO> logEOQueryWrapper = new QueryWrapper<>();
 		logEOQueryWrapper.in("project_library_id",id);
 		projectLawsInventoryLogEOService.remove(logEOQueryWrapper);
+
 	}
 
 	/*
diff --git a/jero-boot/jero-boot-single-startup/pom.xml b/jero-boot/jero-boot-single-startup/pom.xml
index 23e0644e9..a9cfeea5c 100644
--- a/jero-boot/jero-boot-single-startup/pom.xml
+++ b/jero-boot/jero-boot-single-startup/pom.xml
@@ -32,11 +32,6 @@
             <artifactId>jero-boot-modules</artifactId>
             <version>${jero.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.jero.boot</groupId>
-            <artifactId>jero-boot-module-certification</artifactId>
-            <version>${jero.version}</version>
-        </dependency>
         <!--eureka注册中心-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml
index 4b22d505b..062559c32 100644
--- a/jero-boot/pom.xml
+++ b/jero-boot/pom.xml
@@ -55,7 +55,6 @@
 		<module>jero-boot-single-startup</module>
 		<module>jero-boot-modules</module>
 		<module>jero-boot-center</module>
-		<module>jero-boot-module-certification</module>
 	</modules>
 
 	<distributionManagement>

From e865249eecb8e98022da5c9fd42f08285cb8ad71 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 16 Sep 2022 17:31:57 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4:=20=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cert/report/util/Docx4jUtil.java  | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
index 59f2afb6f..4370e10f6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java
@@ -125,12 +125,12 @@ public class Docx4jUtil {
             Map<String, Object> picMap1 = new HashMap<>();
             picMap1.put("key", "NIO-005");
             picMap1.put("text", "XXXXX");
-            picMap1.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true));
+            picMap1.put("bytes", inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true));
 
             Map<String, Object> picMap2 = new HashMap<>();
             picMap2.put("key", "NIO-007");
             picMap2.put("text", "wok#wwokwo");
-            picMap2.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true));
+            picMap2.put("bytes", inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true));
 
             picList.add(picMap1);
             picList.add(picMap2);
@@ -144,6 +144,31 @@ public class Docx4jUtil {
         }
     }
 
+    /**
+     * 将输入流中的数据写入字节数组
+     * @param in
+     * @return
+     */
+    public static byte[] inputStream2ByteArray(InputStream in, boolean isClose) {
+        byte[] byteArray = null;
+        try {
+            int total = in.available();
+            byteArray = new byte[total];
+            in.read(byteArray);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (isClose) {
+                try {
+                    in.close();
+                } catch (Exception e2) {
+                    e2.getStackTrace();
+                }
+            }
+        }
+        return byteArray;
+    }
+
     public static Builder Builder;
 
     public static Builder of(String path) throws FileNotFoundException, Docx4JException {

From 1879f525da57773e63d7f6d0e992484aa90332f4 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 19 Sep 2022 09:52:49 +0800
Subject: [PATCH 07/10] =?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

---
 .../src/views/processCenter/components/examineInformation.vue  | 3 ++-
 .../tabComponents/processCenter/components/batchProcessing.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue
index 2f97ec816..e640eec56 100644
--- a/jero-web/src/views/processCenter/components/examineInformation.vue
+++ b/jero-web/src/views/processCenter/components/examineInformation.vue
@@ -54,7 +54,7 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="standard">
+            <a-form-model-item class="itemModel" prop="approvalOpinion">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
                           :rows="4"/>
             </a-form-model-item>
@@ -151,6 +151,7 @@
     },
     mounted() {
       this.formInline.approvalOpinion = ''
+      this.formInline = {...this.formInline}
     },
     methods: {
       clickButtonToUpload(item) {
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
index 1ea338cea..108dcf2d3 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
@@ -57,7 +57,7 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="standard">
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
                 <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
                             :rows="4"/>
               </a-form-model-item>

From e112d0bb7b8a48f94a9d5a391f102b7f4da8f0c2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 19 Sep 2022 11:22:06 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 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 cf4dd3a35..3ce420998 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
@@ -63,10 +63,12 @@ import org.apache.http.entity.ContentType;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+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.springframework.beans.factory.annotation.Autowired;
@@ -2625,6 +2627,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             XSSFCellStyle cellStyle = workbook.createCellStyle();
             cellStyle.setWrapText(true);//自动换行
             cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+            cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("@")); // 设置文本格式
 
             //合并单元格
             CellRangeAddress region1 =
@@ -2638,7 +2641,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 if (i == 0) {
                     if (StringUtils.isNotBlank(exportFieldName)) {
                         String[] headerArr = exportFieldName.split(",");
+                        String[] headerTypeArr = list.get(3).split(",");
+
                         for (int j = 0; j < headerArr.length; j++) {
+                            // 条款号和输入框数字类型 列 设置单元格格式为文本
+                            if ("*条款号".equals(headerArr[j]) || "*Item No.".equals(headerArr[j]) || FieldTypeEnum.TEXT_NUMBER.getValue().equals(headerTypeArr[j])) {
+                                sheet.setDefaultColumnStyle(j, cellStyle);
+                            }
                             row.createCell(j).setCellValue(headerArr[j]);
                         }
                     }
@@ -2713,6 +2722,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         // 获取新增表单字段
         List<Map<String, Object>> addForm = list;
         StringBuilder sb = new StringBuilder();
+        StringBuilder sbOfType = new StringBuilder();
         List<String> pullMoreList = new LinkedList<>();//多选字段
         List<String> pullSingleList = new LinkedList<>();//单选字段
         List<String> fileList = new LinkedList<>();//文件字段
@@ -2729,6 +2739,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 sb.append(map.get("db_field_txt") + ",");
             }
             String fieldShowType = "field_show_type";
+            sbOfType.append(map.get(fieldShowType) + ",");
                 //多选字段
             if (FieldTypeEnum.PULL_MORE.getValue().equals(map.get(fieldShowType))) {
                 pullMoreList.add((String) map.get("db_field_txt"));
@@ -2759,6 +2770,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             }
         }
         String title = sb.substring(0, sb.length() - 1);
+        String type = sbOfType.substring(0, sbOfType.length() - 1);
 
         //第二行
         StringBuilder sbTwo = new StringBuilder();
@@ -2864,6 +2876,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         resultList.add(title);
         resultList.add(sbTwo.toString());
         resultList.add(count + "");
+        resultList.add(type);
         return resultList;
     }
 

From 194eba9d07a63626ce510b8a88c1cc01f457703e Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 19 Sep 2022 14:23:10 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E6=9F=A5=E7=9C=8B:=20=E8=BF=94=E5=9B=9E=E5=B7=A6?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql              | 6 +++++-
 .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml     | 1 +
 .../com/jero/modules/cert/collect/vo/ParamsManifestVO.java | 2 +-
 .../cert/report/controller/ParamsReportEOController.java   | 4 ++++
 .../jero/modules/cert/report/entity/ParamsReportEO.java    | 7 +++++++
 .../cert/report/mapper/xml/ParamsReportEOMapper.xml        | 2 ++
 .../report/service/impl/ParamsReportEOServiceImpl.java     | 1 +
 7 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index b3f1e7ad9..ccac487e7 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1110,4 +1110,8 @@ INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `c
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711460491968513', '1539780399024934914', '法规意见-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:08:34', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - delete');
 
 -- 上报库删除按钮 2022-09-14已同步生产环境
-INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
\ No newline at end of file
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
+
+-- 上报库 添加项目目标市场 2022-09-19
+ALTER TABLE `laws_weilai`.`params_report`
+    ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index c44aae67c..592058433 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -100,6 +100,7 @@
             pm.id as id,
             pm.version as version,
             pm.title as title,
+            plb.target_market as target_market,
             concat(pni.project_name,'-',pyni.year_name) as project_name
         from params_manifest pm
         left join project_library_base as plb on plb.id = pm.project_id
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
index cec703acd..584936f61 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
@@ -1,6 +1,5 @@
 package com.jero.modules.cert.collect.vo;
 
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -15,6 +14,7 @@ public class ParamsManifestVO {
     private String title;
     private Integer version;
     private String projectName;
+    private String targetMarket;
     private String projectId;
     private String state;
     private String paramsTemplateName;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index b5fbc9a63..80fc4a3df 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -69,6 +69,10 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 
 		IPage page = new Page(pageNo, pageSize);
 		IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
+		List<ParamsReportEO> rows = pageList.getRecords();
+		for (ParamsReportEO row : rows) {
+			row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
+		}
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
index 357bf81ba..49612c6d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
@@ -1,6 +1,7 @@
 package com.jero.modules.cert.report.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,4 +76,10 @@ public class ParamsReportEO implements Serializable {
     @ApiModelProperty(value = "清单标题")
     private String title;
 
+    @ApiModelProperty(value = "目标市场")
+    private String targetMarket;
+
+    @TableField(exist = false)
+    private String pageName; // 项目名称-国家-清单名称
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
index 3314b963f..164200a28 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
@@ -15,6 +15,7 @@
         <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
         <result column="project_name" property="projectName" />
         <result column="title" property="title" />
+        <result column="target_market" property="targetMarket" />
     </resultMap>
 
     <sql id="BaseColumnList">
@@ -27,6 +28,7 @@
         pr.update_by as update_by,
         pr.update_time as update_time,
         if (pm.title is not null, pm.title, pr.title) as title,
+        if (plb.target_market is not null, plb.target_market, pr.target_market) as target_market,
         if (pni.project_name is not null, concat(pni.project_name,'-', pyni.year_name), pr.project_name) as project_name
     </sql>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
index 0f7cdafa6..fd73ae440 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
@@ -184,6 +184,7 @@ public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper,
 					updateEO.setId(paramsReportEO.getId());
 					updateEO.setTitle(paramsManifestVO.getTitle());
 					updateEO.setProjectName(paramsManifestVO.getProjectName());
+					updateEO.setTargetMarket(paramsManifestVO.getTargetMarket());
 
 					updateEOList.add(updateEO);
 				}

From 77f1cdd0228abe90775ac867fdae7b7969fa962c Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 19 Sep 2022 14:27:22 +0800
Subject: [PATCH 10/10] =?UTF-8?q?1.=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5?=
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 +
 .../commponts/customexportmodle.vue           |  36 +-
 .../parameter/managementdetails/index.vue     | 894 +++++++++---------
 4 files changed, 484 insertions(+), 448 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7eafd047e..eff55c5ba 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1298,4 +1298,5 @@ module.exports = {
   personChargeReceivesTheTask:'Person in charge receives the task',
   theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time',
   processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data',
+  exportFileName:'Export file name',
 }
\ 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 251fe8bd5..d4b640677 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1400,4 +1400,5 @@ module.exports = {
   personChargeReceivesTheTask:'责任人接收任务',
   theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务',
   processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据',
+  exportFileName:'导出文件名称',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
index 18cd007ee..c0a2474a3 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
@@ -65,6 +65,22 @@
               </a-col>
 
             </a-row>
+
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('exportFileName')">
+                    <span class="Required">*</span>
+                    <span>{{$t('exportFileName')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="exportName">
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('exportFileName')"
+                             v-model.trim="formInline.exportName"></a-input>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+            </a-row>
           </a-form-model>
         </a-form>
       </a-spin>
@@ -121,6 +137,14 @@ export default {
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
+        exportName:[
+          {
+            max: 70,
+            message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'),
+            trigger: 'blur'
+          },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' },
+        ],
         exportTemplateId: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
         ],
@@ -243,12 +267,12 @@ export default {
           //   query.certCategoryName = this.contentListStart
           // }
           query.paramsManifestId = this.$route.query.id
-          let long = localStorage.getItem('language')
-          if (long && long === 'zh-cn') {
-            query.exportName = '自定义导出'
-          } else if (long && long === 'en-us') {
-            query.exportName = 'Custom'
-          }
+          // let long = localStorage.getItem('language')
+          // if (long && long === 'zh-cn') {
+          //   query.exportName = '自定义导出'
+          // } else if (long && long === 'en-us') {
+          //   query.exportName = 'Custom'
+          // }
           this.confirmLoading = true
           downloadFile('report/detail/exportCustom', query.exportName+'.zip', query)
           this.confirmLoading = false
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 320bc0c8f..5f2b8165b 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -5,7 +5,7 @@
       <div class="Virtual-detail-header" style="top: 0">
         <div class="Virtual-detail-title">
               <span>
-                {{ $t('ParameterViewPage') }}
+                {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}}
               </span>
         </div>
       </div>
@@ -19,9 +19,9 @@
                   <span>{{$t('NcertificationCategory')}}</span>
                 </div>
                 <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
-                                   :placeholder="$t('PleaseSelect')+$t('NcertificationCategory')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'cert_category'"/>
+                                    :placeholder="$t('PleaseSelect')+$t('NcertificationCategory')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'cert_category'"/>
               </div>
             </a-col>
             <a-col :md="6" :sm="8">
@@ -104,39 +104,39 @@
                         @value='value'
                         @listReset='listReset' @LoginUserType='LoginUserType'/>
     </div>
-<!--    <div>-->
-<!--      <a-table-->
-<!--        ref="table"-->
-<!--        size="middle"-->
-<!--        :loading="loading"-->
-<!--        :pagination="false"-->
-<!--        :scroll="{x: true}"-->
-<!--        rowKey="id"-->
-<!--        :data-source="dataSource"-->
-<!--        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
-<!--        :columns="columns"-->
-<!--      >-->
-<!--         <span slot="titleName" slot-scope="text,record" :title="text">-->
-<!--                  {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}-->
-<!--        </span>-->
-<!--        <span slot="operation" slot-scope="text,record">-->
-<!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
-<!--            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>-->
-<!--        </span>-->
-<!--      </a-table>-->
-<!--    </div>-->
-<!--    <div class="page">-->
-<!--      <a-pagination-->
-<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-<!--        show-quick-jumper-->
-<!--        show-size-changer-->
-<!--        :page-size.sync="pageSize"-->
-<!--        :total="total"-->
-<!--        :current="pageNo"-->
-<!--        @change="pageOnChange"-->
-<!--        @showSizeChange="SizeChange"-->
-<!--      />-->
-<!--    </div>-->
+    <!--    <div>-->
+    <!--      <a-table-->
+    <!--        ref="table"-->
+    <!--        size="middle"-->
+    <!--        :loading="loading"-->
+    <!--        :pagination="false"-->
+    <!--        :scroll="{x: true}"-->
+    <!--        rowKey="id"-->
+    <!--        :data-source="dataSource"-->
+    <!--        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
+    <!--        :columns="columns"-->
+    <!--      >-->
+    <!--         <span slot="titleName" slot-scope="text,record" :title="text">-->
+    <!--                  {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}-->
+    <!--        </span>-->
+    <!--        <span slot="operation" slot-scope="text,record">-->
+    <!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
+    <!--            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>-->
+    <!--        </span>-->
+    <!--      </a-table>-->
+    <!--    </div>-->
+    <!--    <div class="page">-->
+    <!--      <a-pagination-->
+    <!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+    <!--        show-quick-jumper-->
+    <!--        show-size-changer-->
+    <!--        :page-size.sync="pageSize"-->
+    <!--        :total="total"-->
+    <!--        :current="pageNo"-->
+    <!--        @change="pageOnChange"-->
+    <!--        @showSizeChange="SizeChange"-->
+    <!--      />-->
+    <!--    </div>-->
     <conventionalModel :url="url" ref="conventionalModel"/>
     <customelModel :url="url" ref="customelModel"/>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
@@ -144,444 +144,454 @@
 </template>
 
 <script>
-import { getAction,postAction } from '../../../api/manage'
-import axios from 'axios'
-import TableCollection from '@/components/tableCollection/index1'
-import conventionalModel from './commponts/conventionalmodle'
-import customelModel from './commponts/customexportmodle'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import PersonnelSelection from '@/components/PersonnelSelection/index'
-import Vue from 'vue'
-export default {
-  name: 'managementdetails',
-  components: {
-    conventionalModel,
-    customelModel,
-    TableCollection,
-    PersonnelSelection
-  },
-  data(){
-    return{
-      columns:[],
-      selectedRowKeys: [],
-      formInline: {},
-      textLoading:false,
-      url: {
-        tableHeader: 'report/detail/getHeader',
-        tableList: 'report/detail/list',
-        ConventionalExport: 'report/detail/exportNormal',
-        // getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
-        // getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
-        // updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
-        // deleteBatch: 'params/collectManifest/deleteBatch',
-      },
-      loading: false,
-      dataSource: [],
-      areaVisible: false, // 弹框的控制
-      configureareaVisible: false, // 配置的彈框
-      pageNo: 1,
-      pageSize: 10,
-      total: 0,
-      selectedRowKeysArray: '',
-      templatetitle: '',
-      templatetitleId: '',
-      rowId: '',
-      version: 0,
-      itemId: '',
-      selectedRowKeysValue: [], // table列表所选得数据
-      token:Vue.ls.get(ACCESS_TOKEN),
-      Dateline: {},
-      areaVisibleFreeze: false, // 冻结配置
-      areaVisibleAssignedby: false, // 分配填写人弹框
-      areaVisibleTaskCutOffTime: false, // 截至时间弹框
-      areaVisiblereferenceparameter: false, // 引用参数弹框
-      areaVisibsynchronous: false, // 同步上报库弹框
-      visibleoperationFailed: false, // 数据失败的弹框
-      currentPersonRole: '', // 当前人角色
-      jurisdiction: '',
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 14 }
-      },
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      rules: {},
-      FreezeList: [], // 冻结字段
-      visibleRoleSwitching: false, // 角色切换
-      confirmLoadingRoleSwitching: false,
-      formInlineRoleSwitching: {},
-      rulesRoleSwitching: {
-        roleSwitchingCode: [
-          {
-            required: true,
-            message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
-            trigger: 'change'
-          }
-        ]
-      },
-      RoleType: [ ],// 控件类型
-      NotSelectedRowKeysValue: [],
-      NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
-      NotSelectedNoEngineerValue: [],
-      paramsManifest: {}
-    }
-  },
-  props: {
-  },
-  mounted() {
-    // this.Getlist()
-    this.getTableList()
-    document.title = this.$t('ParameterViewPage')
-  },
-  methods:{
-    Getlist() {
-      getAction(this.url.tableHeader, {paramsManifestId: this.$route.query.id,flag: 8}).then((res) => {
-        if (res.success) {
-          var jsonHead = res.result
-          this.columns = []
-          // res.db_field_txt
-          jsonHead.forEach((res, index) => {
-            this.columns.push({
-              title: res.db_field_txt,
-              dataIndex: res.db_field_name,
-              align: 'center',
-              ellipsis: true,
-              sorter: res.sort
-            })
+  import { getAction, postAction } from '../../../api/manage'
+  import axios from 'axios'
+  import TableCollection from '@/components/tableCollection/index1'
+  import conventionalModel from './commponts/conventionalmodle'
+  import customelModel from './commponts/customexportmodle'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import Vue from 'vue'
 
-            if (res.urlClick) {
-              this.columns[index].scopedSlots = {
-                customRender: 'urlClick'
-              }
-            }else if(res.db_field_name=='iterms_conditions'){
-              this.columns[index].width='500'
-              this.columns[index].scopedSlots = {
-                customRender: 'showContent'
-              }
-            }else{
-              this.columns[index].scopedSlots = {
-                customRender: 'detailText'
-              }
+  export default {
+    name: 'managementdetails',
+    components: {
+      conventionalModel,
+      customelModel,
+      TableCollection,
+      PersonnelSelection
+    },
+    data() {
+      return {
+        columns: [],
+        selectedRowKeys: [],
+        formInline: {},
+        textLoading: false,
+        url: {
+          tableHeader: 'report/detail/getHeader',
+          tableList: 'report/detail/list',
+          ConventionalExport: 'report/detail/exportNormal'
+          // getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
+          // getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
+          // updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
+          // deleteBatch: 'params/collectManifest/deleteBatch',
+        },
+        loading: false,
+        dataSource: [],
+        areaVisible: false, // 弹框的控制
+        configureareaVisible: false, // 配置的彈框
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        selectedRowKeysArray: '',
+        templatetitle: '',
+        templatetitleId: '',
+        rowId: '',
+        version: 0,
+        itemId: '',
+        selectedRowKeysValue: [], // table列表所选得数据
+        token: Vue.ls.get(ACCESS_TOKEN),
+        Dateline: {},
+        areaVisibleFreeze: false, // 冻结配置
+        areaVisibleAssignedby: false, // 分配填写人弹框
+        areaVisibleTaskCutOffTime: false, // 截至时间弹框
+        areaVisiblereferenceparameter: false, // 引用参数弹框
+        areaVisibsynchronous: false, // 同步上报库弹框
+        visibleoperationFailed: false, // 数据失败的弹框
+        currentPersonRole: '', // 当前人角色
+        jurisdiction: '',
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 14 }
+        },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 7 }
+        },
+        rules: {},
+        FreezeList: [], // 冻结字段
+        visibleRoleSwitching: false, // 角色切换
+        confirmLoadingRoleSwitching: false,
+        formInlineRoleSwitching: {},
+        rulesRoleSwitching: {
+          roleSwitchingCode: [
+            {
+              required: true,
+              message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
+              trigger: 'change'
             }
-          })
-          // console.log('this.columns',this.columns)
-          let width = 0
-          if (this.OperationList.length > 0) {
-            for (let i = 0; i < this.OperationList.length; i++) {
-              width += this.getTextWith(this.OperationList[i].text)
-            }
-          }
-          if (this.showAction) {
-            this.columns.push({
-              title: this.$t('operation'),
-              align: 'center',
-              fixed: 'right',
-              width: width,
-              scopedSlots: { customRender: 'operation' }
-            })
-          }
-          // console.log('columns',this.columns)
-        }
-      })
-    },
-    getcompleteby(e){
-      console.log(e)
-    },
-    PersonnelSelectionChange(value, id) {
-      this.formInline[value] = id
-      this.formInline = { ...this.formInline }
-    },
-    getDataSource(data) {
-      this.dataSource = data
-      console.log(this.dataSource)
-    },
-    // 保存
-    handlePreservation(num) {
-      let _this = this
-      let postDate = []
-      let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
-      let selectedRowKeysValue = []
-      data.forEach(res => {
-          selectedRowKeysValue.push(res)
-      })
-      console.log(selectedRowKeysValue)
-      for (let i = 0; i < selectedRowKeysValue.length; i++) {
-        let postDateobj = {}
-        let itemIn = Object.keys(selectedRowKeysValue[i])
-        for (let j = 0; j < itemIn.length; j++) {
-          if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
-            if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
-              postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
-              for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
-                if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
-                  selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
-                }
-                if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
-                  selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
-                }
-              }
-            }
-          }
-        }
-        postDateobj.id = selectedRowKeysValue[i].id
-        postDate.push(postDateobj)
+          ]
+        },
+        RoleType: [],// 控件类型
+        NotSelectedRowKeysValue: [],
+        NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
+        NotSelectedNoEngineerValue: [],
+        paramsManifest: {}
       }
-      let configDataList = { configDataList: postDate }
-      if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
-          this.textLoading = true
-        let query = {
-          ...configDataList,
-          paramsManifestId: this.$route.query.id
-        }
-        postAction('/report/detail/save', query).then((res) => {
+    },
+    props: {},
+    mounted() {
+      // this.Getlist()
+      this.getTableList()
+      document.title = this.$t('ParameterViewPage')
+    },
+    methods: {
+      Getlist() {
+        getAction(this.url.tableHeader, { paramsManifestId: this.$route.query.id, flag: 8 }).then((res) => {
           if (res.success) {
+            var jsonHead = res.result
+            this.columns = []
+            // res.db_field_txt
+            jsonHead.forEach((res, index) => {
+              this.columns.push({
+                title: res.db_field_txt,
+                dataIndex: res.db_field_name,
+                align: 'center',
+                ellipsis: true,
+                sorter: res.sort
+              })
+
+              if (res.urlClick) {
+                this.columns[index].scopedSlots = {
+                  customRender: 'urlClick'
+                }
+              } else if (res.db_field_name == 'iterms_conditions') {
+                this.columns[index].width = '500'
+                this.columns[index].scopedSlots = {
+                  customRender: 'showContent'
+                }
+              } else {
+                this.columns[index].scopedSlots = {
+                  customRender: 'detailText'
+                }
+              }
+            })
+            // console.log('this.columns',this.columns)
+            let width = 0
+            if (this.OperationList.length > 0) {
+              for (let i = 0; i < this.OperationList.length; i++) {
+                width += this.getTextWith(this.OperationList[i].text)
+              }
+            }
+            if (this.showAction) {
+              this.columns.push({
+                title: this.$t('operation'),
+                align: 'center',
+                fixed: 'right',
+                width: width,
+                scopedSlots: { customRender: 'operation' }
+              })
+            }
+            // console.log('columns',this.columns)
+          }
+        })
+      },
+      getcompleteby(e) {
+        console.log(e)
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      getDataSource(data) {
+        this.dataSource = data
+        console.log(this.dataSource)
+      },
+      // 保存
+      handlePreservation(num) {
+        let _this = this
+        let postDate = []
+        let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
+        let selectedRowKeysValue = []
+        data.forEach(res => {
+          selectedRowKeysValue.push(res)
+        })
+        console.log(selectedRowKeysValue)
+        for (let i = 0; i < selectedRowKeysValue.length; i++) {
+          let postDateobj = {}
+          let itemIn = Object.keys(selectedRowKeysValue[i])
+          for (let j = 0; j < itemIn.length; j++) {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
+              if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+                postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
+                for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+                  if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
+                    selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+                  }
+                  if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+                    selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+                  }
+                }
+              }
+            }
+          }
+          postDateobj.id = selectedRowKeysValue[i].id
+          postDate.push(postDateobj)
+        }
+        let configDataList = { configDataList: postDate }
+        if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
+          this.textLoading = true
+          let query = {
+            ...configDataList,
+            paramsManifestId: this.$route.query.id
+          }
+          postAction('/report/detail/save', query).then((res) => {
+            if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               this.$refs.CollectionTabel.getTableList()
               this.textLoading = false
-          } else {
+            } else {
               _this.$message.warning(_this.$t('operationFailed'))
               this.textLoading = false
+            }
+          })
+        } else {
+        }
+      },
+      getTableList() {
+        // console.log('this.searchParmestable',this.searchParmes)
+        let pageNo = JSON.parse(JSON.stringify(this.pageNo))
+        let pageSize = JSON.parse(JSON.stringify(this.pageSize))
+        let params = {
+          ...this.formInline,
+          paramsManifestId: this.$route.query.id,
+          pageNo: pageNo + '',
+          pageSize: pageSize + ''
+        }
+        // console.log('parmsss',params)
+        this.loading = true
+        getAction(this.url.tableList, params).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getTableList()
+              return
+            }
+            this.dataSource = res.result.records
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
           }
         })
-      } else {
-      }
-    },
-    getTableList() {
-      // console.log('this.searchParmestable',this.searchParmes)
-      let pageNo = JSON.parse(JSON.stringify(this.pageNo))
-      let pageSize = JSON.parse(JSON.stringify(this.pageSize))
-      let params = {
-        ...this.formInline,
-        paramsManifestId: this.$route.query.id,
-        pageNo: pageNo + '',
-        pageSize: pageSize + ''
-      }
-      // console.log('parmsss',params)
-      this.loading = true
-      getAction(this.url.tableList, params).then((res) => {
-        if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = 1
-            this.getTableList()
-            return
-          }
-          this.dataSource = res.result.records
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
+      },
+      onSelectChange() {
+
+      },
+
+      LoginUserType(val, currentPersonRole, userType) {
+        this.RoleType = []
+        if (this.currentPersonRole == '') {
+          this.currentPersonRole = currentPersonRole || userType || val[0].value
         }
-      })
-    },
-    onSelectChange() {
-
-    },
-
-    LoginUserType(val, currentPersonRole, userType) {
-      this.RoleType = []
-      if (this.currentPersonRole == '') {
-        this.currentPersonRole = currentPersonRole || userType || val[0].value
+        this.RoleType = val
+        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
+        this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
+      },
+      GetgetTableList() {
+        this.$refs.CollectionTabel.getTableList()
+      },
+      // 表格所选中得行内容
+      rowValue(val) {
+        this.selectedRowKeysValue = val
+      },
+      // 表格所选中得id
+      value(val) {
+        this.selectedRowKeys = val,
+          this.selectedRowKeysArray = val.join(',')
+      },
+      listReset() {
+        this.formInline = {}
+      },
+      ConventionalExport() {
+        this.$refs.conventionalModel.addModel()
+      },
+      CustomExport() {
+        this.$refs.customelModel.addModel()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.$refs.CollectionTabel.getTableList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.$refs.CollectionTabel.getTableListReset()
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        // this.$emit('handlePreservation')
+        this.getTableList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        // this.$emit('handlePreservation')
+        this.getTableList()
       }
-      this.RoleType = val
-      this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
-      this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
-    },
-    GetgetTableList() {
-      this.$refs.CollectionTabel.getTableList()
-    },
-    // 表格所选中得行内容
-    rowValue(val) {
-      this.selectedRowKeysValue = val
-    },
-    // 表格所选中得id
-    value(val) {
-      this.selectedRowKeys = val,
-        this.selectedRowKeysArray = val.join(',')
-    },
-    listReset() {
-      this.formInline = {}
-    },
-    ConventionalExport() {
-      this.$refs.conventionalModel.addModel()
-    },
-    CustomExport() {
-      this.$refs.customelModel.addModel()
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.$refs.CollectionTabel.getTableList()
-    },
-    searchReset() {
-      this.pageNo = 1
-      this.$refs.CollectionTabel.getTableListReset()
-    },
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      // this.$emit('handlePreservation')
-      this.getTableList()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      // this.$emit('handlePreservation')
-      this.getTableList()
-    },
+    }
   }
-}
 </script>
 
 <style lang="less" scoped>
-@import '~@assets/less/common.less';
-/deep/.ant-card-body{
-  margin-top: -28px;
-}
-.doc-detail {
-  background: #fff;
-  height: 100%;
+  @import '~@assets/less/common.less';
 
-  .Virtual-detail-header {
-    width: 100%;
-    height: 68px;
-    line-height: 68px;
-    padding: 0 32px 0 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2px #eff1f3 solid;
+  /deep/ .ant-card-body {
+    margin-top: -28px;
+  }
+
+  .doc-detail {
     background: #fff;
-    .Virtual-detail-title {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      font-size: 20px;
-      font-weight: 400;
-      color: #040B29;
-      line-height: 68px;
-    }
+    height: 100%;
 
-    .doc-detail-right {
-      width: 800px;
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
       line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
       display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      margin-top: 68px;
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
     }
   }
 
-  .Virtual-detail-content {
-    margin-top: 68px;
-    padding: 0 38px 0 38px;
-    box-sizing: border-box;
+  .header-text {
     font-size: 16px;
-
-    .box-title-text-add {
-      line-height: 1.4;
-    }
-
-    .title-text-add {
-      display: inline-block;
-      font-weight: 500;
-      margin-right: 16px;
-      height: 42px;
-      line-height: 42px;
-    }
+    font-weight: 400;
+    height: 60px;
+    color: #000F16;
+    line-height: 40px;
   }
-}
 
-.header-text {
-  font-size: 16px;
-  font-weight: 400;
-  height: 60px;
-  color: #000F16;
-  line-height: 40px;
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
 
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
-.title-text {
-  width: 20%;
-  min-width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
 
-.box-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 2px;
-}
+  .box-button {
+    height: 38px;
+  }
 
-.box-button {
-  height: 38px;
-}
+  .text-operation {
+    margin-right: 8px;
+  }
 
-.text-operation {
-  margin-right: 8px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
 
-.operator-text-left {
-  font-size: 14px;
-  margin-right: 20px;
-  background: #eff1f3;
-  padding: 8px 8px;
-  cursor: pointer;
-  border-radius: 4px;
-}
-.operator-text-title {
-  cursor: pointer;
-  margin-right: 22px;
-  font-size: 14px;
-  font-weight: 400;
-  color: #040B29;
-  margin-bottom: 22px;
-}
-.box-title-text-index {
-  line-height: 1.4;
-  display: flex;
-}
-.title-text-Comment {
-  width: 74px;
-  text-align: right;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  height: 42px;
-  line-height: 36px;
-}
-.box-input .ant-select-selection {
-  height: 38px !important;
-}
-.itemitem{
-  width: 250px;
-}
-.box-input .ant-select-selection__rendered {
-  line-height: 38px;
-}
-.Required{
-  color: red;
-}
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text-Comment {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 36px;
+  }
+
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .itemitem {
+    width: 250px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+
+  .Required {
+    color: red;
+  }
 </style>
\ No newline at end of file