认证-参数项收集-编号搜索

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -71,7 +71,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
     @ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("params:collectManifest:list")
-	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+	public Result<?> queryList(ParamsCollectManifestVO paramsCollectManifestVO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
 							   @RequestParam(name = "cut") String cut,
@@ -87,7 +87,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 //		}
 
 		IPage page = new Page(pageNo, pageSize);
-		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut, req);
+		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestVO, cut, req);
         return Result.OK(list);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -1,8 +1,11 @@
 package com.jero.modules.cert.collect.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,4 +31,6 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
     IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
     List<ParamsCollectManifestEO> queryByParamManifestId(@Param("paramsManifestId") String paramsManifestIdString);
+
+    IPage selectpage(@Param("page")  IPage page, @Param("ew") Wrapper<ParamsCollectManifestVO> queryWrapper, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -125,4 +125,17 @@
         select * from params_collect_manifest where params_manifest_id = #{paramsManifestId}
     </select>
 
+    <select id="selectpage" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from (
+                 select DISTINCT pcm.*,
+                                 ccpip.params_number as params_number
+                 from params_collect_manifest pcm
+                 left join cert_category_params_info_publish ccpip on pcm.nio_number = ccpip.nio_number
+                 where pcm.params_manifest_id = #{paramsManifestEO.id}
+                   and ccpip.params_template_id = #{paramsManifestEO.paramsTemplateId}
+                   and ccpip.version = #{paramsManifestEO.paramsTemplatePublishVersion}
+             ) temp
+         ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -73,11 +73,11 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
     /**
 	 * 列表查询
 	 * @param page
-	 * @param paramsCollectManifestEO
+	 * @param paramsCollectManifestVO
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req);
+	IPage queryList(IPage page, ParamsCollectManifestVO paramsCollectManifestVO, String cut, HttpServletRequest req);
 
 	/**
 	 * 列表表头中英文切换

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

@@ -4,15 +4,12 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.api.vo.Result;
-import com.jero.common.constant.CommonConstant;
-import com.jero.common.constant.WebsocketConst;
 import com.jero.common.constant.enums.*;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
@@ -53,7 +50,6 @@ import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.split.common.ReadExcel;
-import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.entity.SysUserRole;
@@ -320,17 +316,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req) {
+    public IPage queryList(IPage page, ParamsCollectManifestVO paramsCollectManifestVO, String cut, HttpServletRequest req) {
-		QueryWrapper<ParamsCollectManifestEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap());
+		ParamsCollectManifestVO queryEO = new ParamsCollectManifestVO();
-		queryWrapper.lambda().notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
+		QueryWrapper<ParamsCollectManifestVO> queryWrapper = QueryGenerator.initQueryWrapper(queryEO, req.getParameterMap());
-				.orderByDesc(ParamsCollectManifestEO::getDelFlag)
+		queryWrapper.notIn("control_type", ControlTypeEnum.Title.getValue())
-				.orderByDesc(ParamsCollectManifestEO::getAddFlag)
+				.orderByDesc("del_flag")
-				.orderByDesc(ParamsCollectManifestEO::getChangeFlag)
+				.orderByDesc("add_flag")
-				.orderByAsc(ParamsCollectManifestEO::getNioNumber);
+				.orderByDesc("change_flag")
+				.orderByAsc("nio_number");
 
-		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId);
 
-		String userTypes = paramsCollectManifestEO.getUserTypes();
+		String userTypes = paramsCollectManifestVO.getUserTypes();
 		if (StringUtils.isBlank(userTypes)) {
 			if (CutEnum.CN.getValue().equals(cut)) {
 				throw new JeroBootException("用户类型参数不能为空！");
@@ -348,20 +346,32 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
 		if ("sdt".equals(userTypes)) {
 //			paramsCollectManifestEO.setSdt(loginUser.getUsername());
-			queryWrapper.lambda().eq(ParamsCollectManifestEO::getSdt, loginUser.getUsername())
+			queryWrapper.eq("sdt", loginUser.getUsername())
-					.in(ParamsCollectManifestEO::getState, '2','4','5','6','7','8');
+					.in("state", '2','4','5','6','7','8');
 		} else if ("dre".equals(userTypes)) {
 //			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
-			queryWrapper.lambda().eq(ParamsCollectManifestEO::getDre, loginUser.getUsername())
+			queryWrapper.eq("dre", loginUser.getUsername())
-					.in(ParamsCollectManifestEO::getState, '4','6','7','8');
+					.in("state", '4','6','7','8');
 		}/* else if ("sdt,dre".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
 			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
 		}*/ else if ("guest".equals(userTypes)) {
 			return page;
 		}
+		// 搜索NIO编号或认证类别编号 精确搜索
+		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getAllNumber())) {
+			queryWrapper.and(wrapper->wrapper.eq("nio_number", paramsCollectManifestVO.getAllNumber()).or().eq("params_number", paramsCollectManifestVO.getAllNumber()));
+		}
+		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory())) {
+			List<String> dutyTerritoryList = Arrays.asList(paramsCollectManifestVO.getDutyTerritory().split(","));
+			queryWrapper.in("duty_territory", dutyTerritoryList);
+		}
+		queryWrapper.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName()), "params_name", paramsCollectManifestVO.getParamsName());
+		queryWrapper.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getSdt()), "sdt", paramsCollectManifestVO.getSdt());
+		queryWrapper.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getDre()), "dre", paramsCollectManifestVO.getDre());
 //		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
-		IPage pageInfo = page(page, queryWrapper); // 查询固定列
+//		IPage pageInfo = page(page, queryWrapper); // 查询固定列
+		IPage pageInfo = paramsCollectManifestEOMapper.selectpage(page, queryWrapper,paramsManifestEO); // 查询固定列
 		List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java

@@ -80,4 +80,17 @@ public class ParamsCollectManifestVO {
     @ApiModelProperty(value = "项目相关版本")
     private String projectVersion;
 
+
+    @ApiModelProperty(value = "")
+    private String certCategory;
+    @ApiModelProperty(value = "")
+    private String paramsNumber;
+    @ApiModelProperty(value = "")
+    private String state;
+    @ApiModelProperty(value = "")
+    private String paramsBatch;
+    @ApiModelProperty(value = "")
+    private String allNumber;
+
+
 }

jero-web/src/common/lang/en-us.js

@@ -1361,4 +1361,5 @@ module.exports = {
   relatedProjectVersion:'Related project version',
   Importfailure:'Import failure',
   CuiBan:'CuiBan',
+  certificationCategoryNumber: 'certification Category Number',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1462,4 +1462,5 @@ module.exports = {
   relatedProjectVersion:'相关项目版本',
   Importfailure:'导入失败',
   CuiBan:'催办',
+  certificationCategoryNumber: '认证类别编号',
 }

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

@@ -17,11 +17,11 @@
                 <a-row :gutter="24" style='margin-left: -90px;'>
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('NNiONumber')">
+                      <div class="title-text" :title="$t('ParameterNo')">
-                        <span>{{$t('NNiONumber')}}</span>
+                        <span>{{$t('ParameterNo')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NNiONumber')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
-                               v-model="formInline.nioNumber"></j-input>
+                               v-model="formInline.allNumber"></a-input>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
@@ -29,8 +29,8 @@
                       <div class="title-text" :title="$t('NParameterName')">
                         <span>{{$t('NParameterName')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
-                               v-model="formInline.paramsName"></j-input>
+                               v-model="formInline.paramsName"></a-input>
                     </div>
                   </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -60,8 +60,8 @@
                       <div class="title-text" :title="$t('dre')">
                         <span>{{$t('dre')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
-                               v-model="formInline.dre"></j-input>
+                               v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
@@ -69,8 +69,8 @@
                       <div class="title-text" :title="$t('sdt')">
                         <span>{{$t('sdt')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
-                               v-model="formInline.sdt"></j-input>
+                               v-model="formInline.sdt"></a-input>
                     </div>
                   </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -591,6 +591,11 @@
             text: this.$t('certificationCategory'),
             dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
+          {
+            type: 'input',
+            value: 'paramsNumber',
+            text: this.$t('certificationCategoryNumber')
+          },
           {
             type: '',
             value: 'state',