项目库列表

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java

@@ -46,23 +46,9 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@PostMapping(value = "/page")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
 		IPage<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
-		List<ProjectLibraryBase> records =convertData(pageList.getRecords(),params.get("cut").toString());
+			return Result.OK(params.get("cut").toString(),pageList);
-		return Result.OK(records);
-	}
-	public List<ProjectLibraryBase> convertData(List<ProjectLibraryBase> records, String cut){
-		//分页列表数据中英切换
-		if(CutEnum.EN.getValue().equals(cut)) {
-			for (ProjectLibraryBase data : records) {
-				data.setTargetMarketName(data.getTargetMarketEnName());
-				data.setProjectStatusName(data.getProjectStatusEnName());
-				data.setStudioEngineerName(data.getStudioEngineerEnName());
-				data.setCertificationEngineerName(data.getCertificationEngineerEnName());
-				data.setDigitalPlatformName(data.getDigitalPlatformEnName());
-				data.setVehiclePlatformName(data.getVehiclePlatformEnName());
-			}
-		}
-		return records;
 	}
+
     /**
 	 * 列表查询
 	 *
@@ -143,12 +129,11 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id,
 							   @RequestParam(name="cut",required=true) String cut) {
-//		List<ProjectLibraryBase> data = projectLibraryBaseService.queryById(id);
+		List<ProjectLibraryBase> data = projectLibraryBaseService.queryById(id);
-		List<ProjectLibraryBase> records =convertData(projectLibraryBaseService.queryById(id),cut);
+			if(data==null) {
-		if(records==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(records);
+		return Result.OK(cut,data);
 	}
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -37,18 +37,10 @@ public class ProjectLibraryBase implements Serializable {
     /**目标市场*/
     @Dict(dicCode = "region")
     private java.lang.String targetMarket;
-    @TableField(exist = false)
-    private java.lang.String targetMarketName;
-    @TableField(exist = false)
-    private java.lang.String targetMarketEnName;
 
     /**项目状态*/
     @Dict(dicCode = "project_status")
     private java.lang.String projectStatus;
-    @TableField(exist = false)
-    private java.lang.String projectStatusName;
-    @TableField(exist = false)
-    private java.lang.String projectStatusEnName;
 
     /**studio工程师*/
     private java.lang.String studioEngineer;
@@ -67,18 +59,10 @@ public class ProjectLibraryBase implements Serializable {
     /**车型平台*/
     @Dict(dicCode = "vehicle_platform")
     private java.lang.String vehiclePlatform;
-    @TableField(exist = false)
-    private java.lang.String vehiclePlatformName;
-    @TableField(exist = false)
-    private java.lang.String vehiclePlatformEnName;
 
     /**数字平台*/
     @Dict(dicCode = "digital_platform")
     private java.lang.String digitalPlatform;
-    @TableField(exist = false)
-    private java.lang.String digitalPlatformName;
-    @TableField(exist = false)
-    private java.lang.String digitalPlatformEnName;
 
     /**IPD信息*/
     private java.lang.String ipdInfo;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.modules.project.service.impl;
 
+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;
@@ -7,13 +8,20 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.mapper.SysDictItemMapper;
+import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目库基础表
@@ -26,6 +34,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
 
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
+
+	@Autowired
+	private SysUserMapper sysUserMapper;
+
 	/**
 	 * 保存
 	 *
@@ -114,12 +128,37 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
 		List<ProjectLibraryBase> records = result.getRecords();
-
+		disposeData(records);
 		return result;
 	}
 
+	public void disposeData(List<ProjectLibraryBase> records){
 
 
+		for (ProjectLibraryBase projectLibraryBase:records) {
+			List<SysUser> sysUsers = new ArrayList<>();
+			//认证工程师多个id查询
+			String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
+			if (StringUtils.isNotEmpty(certificationEngineerId)) {
+				QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+				userqueryWrapper.in("id ", certificationEngineerId);
+				sysUsers = sysUserMapper.selectList(userqueryWrapper);
+			}
+			if(CollectionUtils.isNotEmpty(sysUsers)) {
+				if(StringUtils.isNotEmpty(certificationEngineerId)){
+					String certificationEngineerName=sysUsers.stream().filter(e -> certificationEngineerId.equals(e.getId())).
+							map(SysUser::getRealname).collect(Collectors.joining(","));
+					projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
+				}
+			}
+
+		}
+
+
+
+
+	}
+
 }