WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库-分页列表修改

Browse Source
This commit is contained in:
xiejunyu
2022-04-15 09:35:25 +08:00
parent f9c6c3c06c
commit 738ea57e9a
6 changed files with 95 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+23 -6
View File
@@ -3,6 +3,7 @@ package com.jero.modules.project.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryBaseService;
@@ -45,9 +46,23 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
@PostMapping(value = "/page") @PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) { public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params); IPage<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
return Result.OK(pageList); List<ProjectLibraryBase> records =convertData(pageList.getRecords(),params.get("cut").toString());
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;
} }
/** /**
* 列表查询 * 列表查询
* *
@@ -126,12 +141,14 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
@AutoLog(value = "项目库基础表-通过id查询") @AutoLog(value = "项目库基础表-通过id查询")
@ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询") @ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id,
ProjectLibraryBase projectLibraryBase = projectLibraryBaseService.queryById(id); @RequestParam(name="cut",required=true) String cut) {
if(projectLibraryBase==null) { // List<ProjectLibraryBase> data = projectLibraryBaseService.queryById(id);
List<ProjectLibraryBase> records =convertData(projectLibraryBaseService.queryById(id),cut);
if(records==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(projectLibraryBase); return Result.OK(records);
} }
/** /**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+1 -4
View File
@@ -93,8 +93,6 @@ public class ProjectLibraryBase implements Serializable {
private java.lang.String createUserId; private java.lang.String createUserId;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String createUserName; private java.lang.String createUserName;
@TableField(exist = false)
private java.lang.String createUserEnName;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -105,8 +103,7 @@ public class ProjectLibraryBase implements Serializable {
private java.lang.String updateUserId; private java.lang.String updateUserId;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String updateUserName; private java.lang.String updateUserName;
@TableField(exist = false)
private java.lang.String updateUserEnName;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
+6 -1
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@@ -13,6 +14,10 @@ import java.util.Map;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase> { public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase> {
/**分页列表*/
IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params); IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params);
/**根据id查询*/
List<ProjectLibraryBase> queryById(String id);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+54 -40
View File
@@ -22,50 +22,54 @@
</resultMap> </resultMap>
<!--不行，改。哪有这么写SQL，嫌性能太好？ TODO--> <!--不行，改。哪有这么写SQL，嫌性能太好？ TODO-->
<select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase"> <sql id="select_item">
select select
plb.id, plb.id,
plb.project_name, plb.project_name,
plb.target_market, plb.target_market,
marketsdi.item_text as target_market_name, marketsdi.item_text as target_market_name,
marketsdi.en_name as target_market_en_name, marketsdi.en_name as target_market_en_name,
plb.project_status, plb.project_status,
statussdi.item_text as project_status_name, statussdi.item_text as project_status_name,
statussdi.en_name as project_status_en_name, statussdi.en_name as project_status_en_name,
plb.studio_engineer, plb.studio_engineer,
studiouser.realname as studio_engineer_name, studiouser.realname as studio_engineer_name,
studiouser.username as studio_engineer_en_name, studiouser.username as studio_engineer_en_name,
plb.certification_engineer, plb.certification_engineer,
certifyuser.realname as certification_engineer_name, certifyuser.realname as certification_engineer_name,
certifyuser.username as certification_engineer_en_name, certifyuser.username as certification_engineer_en_name,
plb.vehicle_platform, plb.vehicle_platform,
vehiclePlatformsdi.item_text as vehicle_platform_name, vehiclePlatformsdi.item_text as vehicle_platform_name,
vehiclePlatformsdi.en_name as vehicle_platform_en_name, vehiclePlatformsdi.en_name as vehicle_platform_en_name,
plb.digital_platform, plb.digital_platform,
digitalPlatformsdi.item_text as digital_platform_name, digitalPlatformsdi.item_text as digital_platform_name,
digitalPlatformsdi.en_name as digital_platform_en_name, digitalPlatformsdi.en_name as digital_platform_en_name,
plb.ipd_info, plb.ipd_info,
plb.vehicle_development_plan, plb.vehicle_development_plan,
plb.attestation_plan, plb.attestation_plan,
plb.create_user_id, plb.create_user_id,
createuser.realname as create_user_name, createuser.username as create_user_name,
createuser.username as create_user_en_name, plb.create_time,
plb.create_time, plb.update_user_id,
plb.update_user_id, updateuser.username as update_user_name,
createuser.realname as update_user_name, plb.update_time
createuser.username as update_user_en_name,
plb.update_time
from project_library_base as plb from project_library_base as plb
left join sys_dict_item as marketsdi on plb.target_market=marketsdi.id left join sys_dict_item as marketsdi on plb.target_market=marketsdi.item_value
left join sys_dict_item as statussdi on plb.project_status=statussdi.id left join sys_dict_item as statussdi on plb.project_status=statussdi.item_value
left join sys_user as studiouser on plb.studio_engineer=studiouser.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id
left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id
left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.id left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.item_value
left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.id left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.item_value
left join sys_user as createuser on plb.create_user_id=createuser.id left join sys_user as createuser on plb.create_user_id=createuser.id
left join sys_user as updateuser on plb.create_user_id=updateuser.id left join sys_user as updateuser on plb.update_user_id=updateuser.id
</sql>
<select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
<include refid="select_item"/>
<where> <where>
<if test="params.projectName != null and params.projectName != ''"> <if test="params.projectName != null and params.projectName != ''">
<!--搜索条件:项目名称,包含%,单独搜索--> <!--搜索条件:项目名称,包含%,单独搜索-->
@@ -125,4 +129,14 @@
</where> </where>
order by plb.create_time desc order by plb.create_time desc
</select> </select>
<select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
<include refid="select_item"/>
<where>
<if test="id != null and id != '' ">
plb.id=#{id}
</if>
</where>
order by plb.create_time desc
</select>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+1 -1
View File
@@ -53,7 +53,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
* @param id * @param id
* @return * @return
*/ */
ProjectLibraryBase queryById(String id); List<ProjectLibraryBase> queryById(String id);
/** /**
* 列表查询 * 列表查询
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+10 -15
View File
@@ -3,7 +3,6 @@ package com.jero.modules.project.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -26,6 +25,7 @@ import java.util.Map;
public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBaseMapper, ProjectLibraryBase> implements IProjectLibraryBaseService { public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBaseMapper, ProjectLibraryBase> implements IProjectLibraryBaseService {
@Autowired @Autowired
private ProjectLibraryBaseMapper projectLibraryBaseMapper; private ProjectLibraryBaseMapper projectLibraryBaseMapper;
/** /**
* 保存 * 保存
* *
@@ -87,8 +87,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
* @return * @return
*/ */
@Override @Override
public ProjectLibraryBase queryById(String id) { public List<ProjectLibraryBase> queryById(String id) {
return getById(id); List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
return records;
} }
/** /**
@@ -113,18 +114,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
IPage page = new Page(pageNo, pageSize); IPage page = new Page(pageNo, pageSize);
IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params); IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
List<ProjectLibraryBase> records = result.getRecords(); List<ProjectLibraryBase> records = result.getRecords();
String cut = (String) params.get("cut");
//分页列表数据中英切换
if(CutEnum.EN.getValue().equals(cut)){
for(ProjectLibraryBase data:records){
data.setTargetMarketName(data.getTargetMarketEnName());
data.setProjectStatusName(data.getProjectStatusName());
data.setStudioEngineerName(data.getStudioEngineerEnName());
data.setCertificationEngineer(data.getCertificationEngineerEnName());
data.setVehiclePlatformName(data.getVehiclePlatformEnName());
data.setDigitalPlatformName(data.getDigitalPlatformEnName());
}
}
return result; return result;
} }
} }