feat(hrm): 添加抄送标志字段支持已审批流程查询
- 在HrmFlowCcBo中新增ccFlag字段 - 修改HrmFlowCcController的my方法增加ccFlag参数支持 - 在HrmFlowCcServiceImpl中实现ccFlag为1时查询已审批流程实例逻辑 - 添加flowInstMapper依赖注入用于查询流程实例数据 - 增加stream包导入支持列表转换操作 - 在OaSalaryMasterServiceImpl中添加按创建时间倒序排序功能
This commit is contained in:
@@ -8,6 +8,7 @@ import com.ruoyi.common.helper.LoginHelper;
|
||||
import com.ruoyi.hrm.domain.bo.HrmFlowCcBo;
|
||||
import com.ruoyi.hrm.domain.vo.HrmFlowCcVo;
|
||||
import com.ruoyi.hrm.service.IHrmFlowCcService;
|
||||
import liquibase.pro.packaged.F;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -26,7 +27,7 @@ public class HrmFlowCcController extends BaseController {
|
||||
* 抄送我的
|
||||
*/
|
||||
@GetMapping("/my")
|
||||
public TableDataInfo<HrmFlowCcVo> my(@RequestParam(required = false) Long ccUserId,@RequestParam(required = false) Integer readFlag, PageQuery pageQuery) {
|
||||
public TableDataInfo<HrmFlowCcVo> my(@RequestParam(required = false) Long ccUserId,@RequestParam(required = false) Integer readFlag, @RequestParam(required = false) Integer ccFlag,PageQuery pageQuery) {
|
||||
Long uid = ccUserId;
|
||||
if (uid == null) {
|
||||
try {
|
||||
@@ -38,6 +39,9 @@ public class HrmFlowCcController extends BaseController {
|
||||
HrmFlowCcBo bo = new HrmFlowCcBo();
|
||||
bo.setCcUserId(uid);
|
||||
bo.setReadFlag(readFlag);
|
||||
if (ccFlag != null) {
|
||||
bo.setCcFlag(ccFlag);
|
||||
}
|
||||
return service.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user