虚拟清单--分页(技术领域)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java

@@ -142,7 +142,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@AutoLog(value = "文档库信息表-通过id查询")
 	@ApiOperation(value="文档库信息表-通过id查询", notes="文档库信息表-通过id查询")
 	@GetMapping(value = "/queryById")
-//    @RequiresPermissions("document:queryById")
+    @RequiresPermissions("document:queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(id);
 		if(bussDocumentLibraryEO==null) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java

@@ -48,21 +48,14 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor
 	 * 分页列表查询
 	 *
 	 * @param dummyInventoryInfoEO
-	 * @param pageNo
-	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
 	@AutoLog(value = "虚拟清单详情表-分页列表查询")
 	@ApiOperation(value="虚拟清单详情表-分页列表查询", notes="虚拟清单详情表-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(DummyInventoryInfoEO dummyInventoryInfoEO,
+	public Result<?> queryPageList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+		IPage<DummyInventoryInfoEO> pageList = dummyInventoryInfoEOService.getPageInfo(dummyInventoryInfoEO,req);
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
-		Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(pageNo, pageSize);
-		IPage<DummyInventoryInfoEO> pageList = dummyInventoryInfoEOService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java

@@ -93,6 +93,9 @@ public class DummyInventoryInfoEO implements Serializable {
     @ApiModelProperty(value = "技术领域")
     private java.lang.String technologyTerritory;
 
+	@TableField(exist = false)
+    private java.lang.String technologyTerritoryName;
+
 	/**新车型实施日期*/
 	@Excel(name = "新车型实施日期", width = 15)
     @ApiModelProperty(value = "新车型实施日期")
@@ -125,21 +128,25 @@ public class DummyInventoryInfoEO implements Serializable {
 	/**实施类别*/
 	@Excel(name = "实施类别", width = 15)
     @ApiModelProperty(value = "实施类别")
+    @Dict(dicCode ="implement_type")
     private java.lang.String implementType;
 
 	/**认证类型*/
 	@Excel(name = "认证类型", width = 15)
     @ApiModelProperty(value = "认证类型")
+    @Dict(dicCode ="attestation_type")
     private java.lang.String attestationType;
 
 	/**认证级别*/
 	@Excel(name = "认证级别", width = 15)
     @ApiModelProperty(value = "认证级别")
+    @Dict(dicCode ="attestation_rank")
     private java.lang.String attestationRank;
 
 	/**责任领域*/
 	@Excel(name = "责任领域", width = 15)
     @ApiModelProperty(value = "责任领域")
+    @Dict(dicCode ="duty_territory")
     private java.lang.String dutyTerritory;
 
 	/**备注*/
@@ -150,6 +157,7 @@ public class DummyInventoryInfoEO implements Serializable {
 	/**设计符合性确认-交付物类型*/
 	@Excel(name = "设计符合性确认-交付物类型", width = 15)
     @ApiModelProperty(value = "设计符合性确认-交付物类型")
+    @Dict(dicCode ="deliverable_template")
     private java.lang.String designDeliverableType;
 
 	/**设计符合性确认-交付物模板*/
@@ -214,4 +222,10 @@ public class DummyInventoryInfoEO implements Serializable {
 	@TableField(exist = false)
 	private String ids;
 
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.dummy.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -64,6 +65,8 @@ public interface IDummyInventoryInfoEOService extends IService<DummyInventoryInf
 	 */
     List<DummyInventoryInfoEO> queryList();
 
+	IPage<DummyInventoryInfoEO>  getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req);
+
 
 	/**
 	 * 批量设置

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -1,12 +1,19 @@
 package com.jero.modules.dummy.service.impl;
 
 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.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper;
 import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +24,11 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 虚拟清单详情表
@@ -32,6 +42,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 	@Autowired
 	private IBussDocumentLibraryEOService iBussDocumentLibraryEOService;
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+
+
+	@Override
+	public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
+		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
+		Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
+		IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
+
+		//技术领域处理
+		treeDict(dummyInventoryInfoEO, pageInfo);
+		return pageInfo;
+	}
+
+
+
 	/**
 	 * 保存
 	 *
@@ -40,6 +67,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	@Override
     public void add(DummyInventoryInfoEO dummyInventoryInfoEO) {
+		//需要验重(验重--已添加过的不能再添加,提示该标准已存在清单中，不可添加)
 		if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
 			LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
 			wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(dummyInventoryInfoEO.getIds().split(",")));
@@ -145,4 +173,44 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) {
 
 	}
+
+	/**
+	 * 技术领域数据字典处理
+	 * @param dummyInventoryInfoEO
+	 * @param pageInfo
+	 */
+	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, IPage<DummyInventoryInfoEO> pageInfo) {
+		Set<String> technologyTerritorySet = new HashSet<>();
+		for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
+			if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
+				List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
+				technologyTerritorySet.addAll(list);
+			}
+		}
+		//树形结构数据字典(技术领域)
+		if(technologyTerritorySet.size() != 0){
+			LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(SysCategory::getId,technologyTerritorySet);
+			List<SysCategory> categoryList = sysCategoryService.list(wrapper);
+			for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
+				if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
+					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
+					StringBuilder sb = new StringBuilder();
+					for (String technologyTerritory : technologyTerritoryList) {
+						List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
+							sb.append(collect.get(0).getName() + ",");
+						}else{
+							sb.append(collect.get(0).getEnName());
+						}
+					}
+					String technologyTerritoryName = "";
+					if(StringUtils.isNotBlank(sb)){
+						technologyTerritoryName = sb.substring(0, sb.length() - 1);
+					}
+					record.setTechnologyTerritoryName(technologyTerritoryName);
+				}
+			}
+		}
+	}
 }