bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

多工程入场问题

This commit is contained in:
方亮 2025-11-11 14:37:36 +08:00
parent 8d40ae4a46
commit 68bd62731a
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java
View File

@ -130,7 +130,7 @@ public class HomePageSubController extends BaseController {
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query"))
@GetMapping("/getTeamMsg")
@SysLog(title = "班组详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "班组详情")
public TableDataInfo getTeamMsg(HomePagePo o) {
public TableDataInfo getTeamMsg(HomePagePoVo o) {
try {
if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){
Map<String,String> map = dealWithPermission();
@ -333,7 +333,7 @@ public class HomePageSubController extends BaseController {
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query"))
@PostMapping("/teamExport")
@SysLog(title = "班组导出", businessType = OperaType.EXPORT, logType = 0, module = "首页->二级页面", details = "班组导出")
public void teamExport(HttpServletResponse response, HomePagePo o) {
public void teamExport(HttpServletResponse response, HomePagePoVo o) {
try {
if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){
Map<String,String> map = dealWithPermission();

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java
View File

@ -36,7 +36,7 @@ public interface HomePageSubMapper {
* @param o
* @return
*/
List<HomePageSubProVo> getTeamMsg(HomePagePo o);
List<HomePageSubProVo> getTeamMsg(HomePagePoVo o);
/**
* 获取人员详情

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java
View File

@ -35,7 +35,7 @@ public interface HomePageSubService {
* @param o
* @return
*/
List<HomePageSubProVo> getTeamMsg(HomePagePo o);
List<HomePageSubProVo> getTeamMsg(HomePagePoVo o);
/**
* 人员详情

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java
View File

@ -43,8 +43,12 @@ public class HomePageSubServiceImpl implements HomePageSubService {
}
@Override
public List<HomePageSubProVo> getTeamMsg(HomePagePo o) {
public List<HomePageSubProVo> getTeamMsg(HomePagePoVo o) {
if (o.getProId() != null){
String[] split = o.getProId().split(",");
o.setProIds(Arrays.asList(split));
o.setProId(null);
}
return mapper.getTeamMsg(o);
}

6
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml
View File

@ -232,6 +232,12 @@
<if test="proId != null">
AND pp.id = #{proId}
</if>
<if test="proIds != null">
AND pp.id IN
<foreach item="item" collection="proIds" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="subId != null">
AND ps.id = #{subId}
</if>