From cc4e548d0f04945fed274d151cf032dd93561e3f Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Sat, 18 Nov 2023 14:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E5=8F=91=E5=B8=83=EF=BC=8C=E5=8A=A0=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsManifestEOMapper.xml     |  2 +-
 .../impl/ParamsManifestEOServiceImpl.java     | 28 +++++++++++++------
 .../parameter/ParameterTemplate/index.vue     |  7 +++++
 3 files changed, 28 insertions(+), 9 deletions(-)

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 3b8f336e0..7c97b3e40 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
@@ -52,7 +52,7 @@
         pm.params_template_publish_version as params_template_publish_version,
         pm.project_version as project_version,
         pm.explanation as explanation,
-        if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name
+        pt.params_template_name as params_template_name
     </sql>
 
     <sql id="BaseQuerySql">
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 227b2d417..c91e9f1e3 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
@@ -158,17 +158,20 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 
     @Override
     public List<ParamsManifestEO> queryList(ParamsManifestEO paramsManifestEO) {
+        IPage page = new Page(1, 100);
+        IPage pageList = pageInfo(page, paramsManifestEO);
         List<ParamsManifestEO> resList = new ArrayList<>();
-        LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){
-            queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
-        }
-        queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
-        List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
-        resList.addAll(paramsManifestEOList);
+//        LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+//        if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){
+//            queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
+//        }
+//        queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
+        List<ParamsManifestEO> paramsManifestEOList = pageList.getRecords();
         for (ParamsManifestEO pm : paramsManifestEOList) {
             pm.setIsHistory("0");
         }
+        resList.addAll(paramsManifestEOList);
+
         List<ParamsManifestHistoryEO> hisList = paramsManifestHistoryEOService.getHistoryListByProjectId(paramsManifestEO.getProjectId());
         if(CollectionUtils.isNotEmpty(hisList)){
             for (ParamsManifestHistoryEO his : hisList) {
@@ -280,6 +283,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
             LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid);
             List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+            for (ParamsCollectManifestEO peo:paramsCollectManifestEOList) {
+                peo.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
+            }
             // 根据参数模板id发布版本查询对应参数项集合
             List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version));
 
@@ -294,7 +300,13 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                         target.setParamsName(source.getParamsName());
                         target.setParamsBatch(source.getParamsBatch());
                         target.setDutyTerritory(source.getDutyTerritory());
+                        if(!StringUtils.equals(source.getControlType(),target.getControlType())){
+                            target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+                        }
                         target.setControlType(source.getControlType());
+                        if(!StringUtils.equals(source.getControlValues(),target.getControlValues())){
+                            target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+                        }
                         target.setControlValues(source.getControlValues());
                         target.setControlVerify(source.getControlVerify());
                         target.setFileTemplateConnectId(source.getFileTemplateConnectId());
@@ -307,7 +319,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                     BeanUtils.copyProperties(source, target);
                     target.setId(UUID.randomUUID().toString().replace("-", ""));
                     target.setParamsManifestId(cid);
-                    target.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
+                    target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
                     target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
                     target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
                     target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index 0b9834aff..2f45d25bf 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -91,6 +91,7 @@
         @showSizeChange="SizeChange"
       />
     </div>
+    <JLoading :loading="JLoading">{{ $t('pleaseWaitWhileRunning') }}</JLoading>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
     <a-modal class="show-copy" v-model="areaVisible" :title="$t('templateCopy')" :footer="null" @cancel="hideModal">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
@@ -139,6 +140,7 @@ export default {
       token:Vue.ls.get(ACCESS_TOKEN),
       loading: false,
       toggleSearchStatus: false,
+      JLoading:false,
       selectedRowKeys: [],
       selectedRowKeysArray: '',
       orderBy: '1',
@@ -299,13 +301,16 @@ export default {
       this.$confirm({
         content: item.status && item.status == '1' ? _this.$t('confirmWithdraw') : _this.$t('confirmRelease'),
         onOk() {
+          _this.JLoading = true
           if (item.status && item.status == '1'){
             getAction('params/paramsInfo/withdraw', { paramsTemplateId: item.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(res.result)
                 _this.getList()
+                _this.JLoading = false
               } else {
                 _this.$message.warning(res.message)
+                _this.JLoading = false
               }
             })
           }else{
@@ -313,8 +318,10 @@ export default {
               if (res.success) {
                 _this.$message.success(res.result)
                 _this.getList()
+                _this.JLoading = false
               } else {
                 _this.$message.warning(res.message)
+                _this.JLoading = false
               }
             })
           }