ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准化活动): 79617

Browse Source
This commit is contained in:
yjz
2023-12-28 11:03:54 +08:00
parent a947c47ea2
commit 6c7ff6e77b
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+16
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.standardization.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
@@ -157,6 +158,21 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
return Result.OK(lawsStandardizationService.queryMeetingByStandardizationId(standardizationId));
}
/**
* 标准化活动-会议统计-参会记录（分页）
*
* @param standardizationId
* @return
*/
@AutoLog(value = "标准化活动-会议统计-参会记录（分页）")
@ApiOperation(value="标准化活动-会议统计-参会记录（分页）", notes="标准化活动-会议统计-参会记录（分页）")
@GetMapping(value = "/queryMeetingPageByStandardizationId")
public Result<IPage<LawsStandardizationMeeting>> queryMeetingPageByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId,
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
return Result.OK(lawsStandardizationService.queryMeetingPageByStandardizationId(standardizationId, pageNo, pageSize));
}
/**
* 标准化活动-详情通过id查询
* @return
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java
+10
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.standardization.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.standardization.entity.*;
import com.jero.modules.laws.standardization.vo.StandardizationVO;
@@ -99,4 +100,13 @@ public interface ILawsStandardizationService extends IService<LawsStandardizatio
* @param id
*/
void delete(String id);
/**
* 标准化活动-会议统计-参会记录（分页）
* @param standardizationId
* @param pageNo
* @param pageSize
* @return
*/
IPage<LawsStandardizationMeeting> queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize);
}
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+17 -1
View File
@@ -2,6 +2,8 @@ package com.jero.modules.laws.standardization.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.exception.JeroBootException;
import com.jero.common.util.SnowflakeUtils;
@@ -463,6 +465,21 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
new LambdaQueryWrapper<LawsStandardizationMeeting>()
.eq(LawsStandardizationMeeting::getStandardizationId, standardizationId)
.orderByDesc(LawsStandardizationMeeting::getCreateTime));
setUserInfo(lawsStandardizationMeetingList);
return lawsStandardizationMeetingList;
}
@Override
public IPage<LawsStandardizationMeeting> queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize) {
IPage<LawsStandardizationMeeting> page = lawsStandardizationMeetingService.page(new Page<>(pageNo, pageSize),
new LambdaQueryWrapper<LawsStandardizationMeeting>()
.eq(LawsStandardizationMeeting::getStandardizationId, standardizationId)
.orderByDesc(LawsStandardizationMeeting::getCreateTime));
setUserInfo(page.getRecords());
return page;
}
private void setUserInfo(List<LawsStandardizationMeeting> lawsStandardizationMeetingList) {
for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) {
// 人员信息
if (StringUtils.isNotBlank(lawsStandardizationMeeting.getPersonnelId())){
@@ -480,7 +497,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
lawsStandardizationMeeting.setMeetingData(fileIds);
}
}
return lawsStandardizationMeetingList;
}
@Override