参数清单搜索条件修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -697,6 +697,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             sqlJoinSb.append(" and dre like '%").append(paramsCollectManifestVO.getDre()).append("%'");
         }
 
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getState())) {
+            paramsCollectManifestVO.setDre(paramsCollectManifestVO.getState().replaceAll("'", "\'"));
+            sqlJoinSb.append(" and state = '").append(paramsCollectManifestVO.getDre()).append("'");
+        }
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getCertCategory())) {
+            sqlJoinSb.append(" and cert_category like '%").append(paramsCollectManifestVO.getCertCategory()).append("%'");
+        }
+
         // 如果高级查询条件不为空，拼接参数
         if (StringUtils.isNotEmpty(paramsCollectManifestVO.getQueryConditionVOListStr())) {
             List<QueryConditionVO> queryConditionVOList = JSONObject.parseArray(paramsCollectManifestVO.getQueryConditionVOListStr(), QueryConditionVO.class);

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

@@ -799,12 +799,12 @@
             value: 'paramsNumber',
             text: this.$t('certificationCategoryNumber')
           },
-          // {
+          {
-          //   type: '',
+            type: '',
-          //   value: 'state',
+            value: 'state',
-          //   text: this.$t('status'),
+            text: this.$t('status'),
-          //   options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          // },
+          },
           {
             type: 'string',
             value: 'params_batch',