From eddc47631c53fd32302380a5b3d4c73f15dbe239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 11 May 2023 21:28:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java     |  4 ++--
 .../impl/ParamsManifestEOServiceImpl.java        | 16 ++++++++++++++++
 .../controller/ProjectLibraryBaseController.java |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java      |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index b3d6abffe..69b474d20 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -128,8 +128,8 @@ public class SysUserController {
      * @return
      */
     @ApiOperation(value = "用户管理-分页查询")
-    @RequiresPermissions("sys:user:list")
-    @PermissionData(pageComponent = "system/UserList")
+//    @RequiresPermissions("sys:user:list")
+//    @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
diff --git a/jero-boot/jero-boot-modules/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
index 2bbf14a84..5ea394321 100644
--- a/jero-boot/jero-boot-modules/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
@@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                         target.setControlValues(source.getControlValues());
                         target.setControlVerify(source.getControlVerify());
                         target.setFileTemplateConnectId(source.getFileTemplateConnectId());
+                        break;
                     }
                 }
                 if(!isHave){
@@ -248,6 +249,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                 }
             }
             paramsCollectManifestEOService.saveOrUpdateBatch(paramsCollectManifestEOList);
+
+            List<String> delList = new ArrayList<>();
+            for (ParamsCollectManifestEO target : paramsCollectManifestEOList) {
+                boolean isHave = false;
+                for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
+                    if (target.getNioNumber().equals(source.getNioNumber())) {
+                        isHave = true;
+                        break;
+                    }
+                }
+                if(!isHave){
+                    delList.add(target.getId());
+                }
+            }
+            paramsCollectManifestEOService.deleteByIds(delList);
         }catch (Exception e){
             e.printStackTrace();
             return false;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index b870ca39e..c747e6bdc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -41,7 +41,7 @@ import java.util.Map;
  */
 @Api(tags="项目库基础表")
 @RestController
-@RequestMapping("/project/projectLibraryBase")
+@RequestMapping("/已同步生产环境braryBase")
 @Slf4j
 public class ProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IProjectLibraryBaseService> {
 	@Autowired
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 0e3d4a4fc..ac836dd1d 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
@@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String projectId = UUID.randomUUID().toString().replace("-", "");
 		//主表中添加数据
 		ProjectLibraryBase projectLibraryBaseTemp = this.getById(id);
+		projectLibraryBaseTemp.setCreateBy(null);
+		projectLibraryBaseTemp.setCreateTime(null);
+		projectLibraryBaseTemp.setUpdateBy(null);
+		projectLibraryBaseTemp.setUpdateTime(null);
 		projectLibraryBaseTemp.setId(projectId);
 		projectLibraryBaseTemp.setParentId(id);
 		projectLibraryBaseTemp.setProjectVersion(projectLibraryBase.getProjectVersion());

From 77423de802d0827145e816ec3bb746939f18cba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 11 May 2023 21:29:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectLibraryBaseController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index c747e6bdc..b870ca39e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -41,7 +41,7 @@ import java.util.Map;
  */
 @Api(tags="项目库基础表")
 @RestController
-@RequestMapping("/已同步生产环境braryBase")
+@RequestMapping("/project/projectLibraryBase")
 @Slf4j
 public class ProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IProjectLibraryBaseService> {
 	@Autowired

From 0a95d81eaa9f6fe8a9cf6612a16075ec3d771e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 12 May 2023 09:57:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/listAddModel.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index 733d0b608..85bc82d41 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="$t('Add')"
+    :title="$t('add')"
     :maskClosable="false"
     :width="1000"
     placement="right"

From c3f643e5684dfd88b7fe900aefa0f904087b59e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 12 May 2023 14:19:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../library/docDetail/index.vue               |   4 +-
 .../documentManage/tags/dialog/DicList.vue    |   1 +
 .../documentManage/tags/dialog/ListTable.vue  | 167 ++++++++++--------
 .../components/certificationActivity.vue      |   2 +-
 .../components/listOfRelevantPersonnel.vue    |   7 +
 .../components/regulatoryCompliance.vue       |   6 +-
 6 files changed, 110 insertions(+), 77 deletions(-)

diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index e9fad8099..7e758c7ee 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -846,11 +846,11 @@
           }
 
           .text-field-right {
-            width: calc(66.6% - 130px);
+            width: calc(100% - 130px);
             display: inline-block;
             font-size: 14px;
             text-overflow: ellipsis;
-            white-space: nowrap;
+            white-space: pre-wrap;
             word-break: break-word;
             overflow: hidden;
             float: left;
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index ed37d66fb..2c0b5e793 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -26,6 +26,7 @@
       </div>
       <div class="dic-list-table">
         <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
+                    :record="record"
                     @deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
                     @ok="ok"></list-table>
         <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"
diff --git a/jero-web/src/views/documentManage/tags/dialog/ListTable.vue b/jero-web/src/views/documentManage/tags/dialog/ListTable.vue
index 61fed1171..a5786a581 100644
--- a/jero-web/src/views/documentManage/tags/dialog/ListTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/ListTable.vue
@@ -1,30 +1,30 @@
 <template>
-    <div class="list-table">
-      <a-table :data-source="tableData" :scroll="{x: 900}"
-               :columns="columns" rowKey="id"
-               :components="drag(columns,'columns')"
-               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-               :pagination="false"
-               class="tag-con-table">
+  <div class="list-table">
+    <a-table :data-source="tableData" :scroll="{x: 900}"
+             :columns="columns" rowKey="id"
+             :components="drag(columns,'columns')"
+             :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+             :pagination="false"
+             class="tag-con-table">
 
-        <template slot="action" slot-scope="text, record">
-          <a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
-          <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
-        </template>
-      </a-table>
-      <div class="page" v-if="tableData.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :current="queryParams.pageNo"
-          :page-size.sync="queryParams.pageSize"
-          :total="total"
-          @change="onChangePage"
-          @showSizeChange="SizeChange"
-        />
-      </div>
+      <template slot="action" slot-scope="text, record">
+        <a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
+        <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
+      </template>
+    </a-table>
+    <div class="page" v-if="tableData.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :current="queryParams.pageNo"
+        :page-size.sync="queryParams.pageSize"
+        :total="total"
+        @change="onChangePage"
+        @showSizeChange="SizeChange"
+      />
     </div>
+  </div>
 </template>
 
 <script>
@@ -32,115 +32,140 @@
 
   export default {
     name: 'listTable',
-    props:{
-      tableData:Array,
-      total:Number,
-      queryParams: Object
+    props: {
+      tableData: Array,
+      total: Number,
+      queryParams: Object,
+      record: Object
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data(){
-      return{
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
         // tableData:[],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
         // total:0,
         // queryParams:{
         //   pageNo:1,
         //   pageSize:10
         // },   //搜索条件
-        columns: [
+        columnsAll: [
           {
             title: this.$t('name'),
             dataIndex: 'itemText',
             key: 'itemText',
-            align: "left",
+            align: 'left',
             ellipsis: true,
-            width: 100,
+            width: 100
           },
           {
             title: this.$t('enName'),
-            align: "left",
+            align: 'left',
             width: 100,
             ellipsis: true,
-            dataIndex: 'enName',
+            dataIndex: 'enName'
+          },
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            dataIndex: 'statNode',
+            ellipsis: true,
+            width: 100
           },
           {
             title: this.$t('describe'),
-            align: "left",
+            align: 'left',
             width: 100,
             ellipsis: true,
-            dataIndex: 'description',
+            dataIndex: 'description'
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
-            align: "left",
+            scopedSlots: { customRender: 'action' },
+            align: 'left',
             width: 170
           }
         ],
-        dataFlag:false
+        dataFlag: false
       }
     },
     mounted() {
       // this.loadData()
+      console.log(this.record)
     },
-    methods:{
-      //获取列表数据
-      loadData(){
-        this.dataFlag=false
-        let params={
-          ...this.queryParams,
-          dictId:this.record.id
+    computed: {
+      columns() {
+        let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.record.id != '1513417672023441409') {
+          for (let i = 0; i < columnsAll.length; i++) {
+            if (columnsAll[i].dataIndex == 'statNode') {
+              columnsAll.splice(i, 1)
+              i--
+            }
+          }
         }
-        getAction(`sys/dictItem/page`,params).then(res=>{
-          if(res.success){
-            this.tableData=[...res.result.records]
-            this.dataFlag=true
+        return columnsAll
+      }
+    },
+    methods: {
+      //获取列表数据
+      loadData() {
+        this.dataFlag = false
+        let params = {
+          ...this.queryParams,
+          dictId: this.record.id
+        }
+        getAction(`sys/dictItem/page`, params).then(res => {
+          if (res.success) {
+            this.tableData = [...res.result.records]
+            this.dataFlag = true
           }
         })
       },
       //编辑
-      actionEdit(val){
-        this.$emit('editDict',val,true)
+      actionEdit(val) {
+        this.$emit('editDict', val, true)
       },
       //删除
-      onDelete(val){
-        this.$emit('deleteDict',val.id,true)
+      onDelete(val) {
+        this.$emit('deleteDict', val.id, true)
       },
       onSelectChange(selectedRowKeys) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.$emit('selected',this.selectedRowKeys)
+        this.selectedRowKeys = selectedRowKeys
+        this.$emit('selected', this.selectedRowKeys)
       },
 
       //点击页数
-      onChangePage(page,pageSize){
+      onChangePage(page, pageSize) {
         this.queryParams.pageNo = page
-        this.$emit('ok',this.queryParams)
+        this.$emit('ok', this.queryParams)
         // this.loadData()
       },
       //一页显示条数
-      SizeChange(page,pageSize){
+      SizeChange(page, pageSize) {
         this.queryParams.pageSize = pageSize
-        this.queryParams.pageNo=1
-        this.$emit('ok',this.queryParams)
+        this.queryParams.pageNo = 1
+        this.$emit('ok', this.queryParams)
 
         // this.loadData()
-      },
+      }
     }
   }
 </script>
 
 <style lang="less" scoped>
-  .list-table{
-    .tag-con-table{
-      .action-edit{
+  .list-table {
+    .tag-con-table {
+      .action-edit {
         margin-right: 5px;
       }
-      .action-delete{
-        color:red;
+
+      .action-delete {
+        color: red;
       }
     }
-    .page{
+
+    .page {
       margin-top: 20px;
       text-align: right;
     }
diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue
index 7450f2c6e..ef669653b 100644
--- a/jero-web/src/views/projectManagement/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue
@@ -310,7 +310,7 @@
         myChart.on('click', (params) => {
           console.log(params)
           let query = {
-            title: params.seriesName,
+            title: params.seriesName+'-'+params.name,
             projectLibraryId: this.$route.query.id
           }
           if (params.seriesName === this.$t('certificationTaskConfirmation')) {
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 59641c578..f79762644 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -295,6 +295,13 @@
         visible: false,
         queryParam: {},
         columnsAll: [
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            dataIndex: 'statNode',
+            ellipsis: true,
+            width: 100
+          },
           {
             title: this.$t('areaOfResponsibility'),
             align: 'left',
diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
index 834ab877d..9b6e851cd 100644
--- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
+++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
@@ -150,21 +150,21 @@
           let query = {}
           if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryFGTaskToConfirmStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('designCompliance')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryDesignStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('verifyCompliance')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryVerifyStatistics',
               status: params.data.status