lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标前管理-风险信息，人员任命修改

Browse Source
This commit is contained in:
xiaozhou
2025-12-09 18:59:18 +08:00
parent 833ea7af7d
commit 509fc8cc28
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java
View File

@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.ryrm.controller;
import java.util.List;
import cn.dev33.satoken.annotation.SaMode;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -36,6 +40,20 @@ public class XzdBqglRyrmController extends BaseController {
private final IXzdBqglRyrmService xzdBqglRyrmService;
private final IXzdBidPreProjectService xzdBidPreProjectService;
/**
* 查询标前立项列表
*/
@SaCheckPermission(value = {"ryrm:bqglRyrm:list","ryrm:bqglRyrm:add","ryrm:bqglRyrm:edit"},mode = SaMode.OR)
@GetMapping("/getlist")
public QueryListXzdVo list(QuerBiddingManagementDto bo, PageQuery pageQuery) {
return xzdBidPreProjectService.queryPageList(bo, pageQuery);
}
/**
* 查询标前管理-人员任命列表
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java
View File

@ -43,6 +43,11 @@ public class XzdBqglRyrm extends BaseEntity {
*/
private String projectNumber;
/**
* 人员编码
*/
private String ryNumber;
/**
* 项目类型
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java
View File

@ -47,7 +47,10 @@ public class XzdBqglRyrmBo extends BaseEntity {
*/
@NotBlank(message = "项目编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectNumber;
/**
* 人员编码
*/
private String ryNumber;
/**
* 项目类型
*/

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java
View File

@ -42,6 +42,11 @@ public class XzdBqglRyrmVo implements Serializable {
@ExcelProperty(value = "主表id(标前立项)")
private Long masterId;
/**
* 人员编码
*/
private String ryNumber;
/**
* 项目名称
*/
@ -59,6 +64,11 @@ public class XzdBqglRyrmVo implements Serializable {
*/
@ExcelProperty(value = "项目类型")
private Long projectTypeId;
/**
* 项目类型
*/
@ExcelProperty(value = "项目类型")
private String projectTypeName;
/**
* 单据日期

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java
View File

@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx;
import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo;
import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmRmxxService;
import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.service.IXzdProjectTypeService;
import org.springframework.stereotype.Service;
import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo;
import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo;
@ -37,6 +40,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl<XzdBqglRyrmMapper, XzdBq
private final XzdBqglRyrmMapper baseMapper;
private final IXzdBqglRyrmRmxxService xzdBqglRyrmRmxxService;
private final IXzdProjectTypeService xzdProjectTypeService;
/**
* 查询标前管理-人员任命
@ -55,6 +59,12 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl<XzdBqglRyrmMapper, XzdBq
if (xzdBqglRyrmVo != null){
List<XzdBqglRyrmRmxx> xzdBqglRyrmRmxxes = xzdBqglRyrmRmxxService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdBqglRyrmRmxx>().eq(XzdBqglRyrmRmxx::getMasterId, xzdBqglRyrmVo.getId()));
xzdBqglRyrmVo.setRmxxBoList(MapstructUtils.convert(xzdBqglRyrmRmxxes, XzdBqglRyrmRmxxVo.class));
if (xzdBqglRyrmVo.getProjectTypeId() != null){
XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(xzdBqglRyrmVo.getProjectTypeId());
if (xzdProjectTypeVo != null){
xzdBqglRyrmVo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
}
}
}
}
@ -70,6 +80,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl<XzdBqglRyrmMapper, XzdBq
public TableDataInfo<XzdBqglRyrmVo> queryPageList(XzdBqglRyrmBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdBqglRyrm> lqw = buildQueryWrapper(bo);
Page<XzdBqglRyrmVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(this::saveValue);
return TableDataInfo.build(result);
}
@ -92,6 +103,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl<XzdBqglRyrmMapper, XzdBq
lqw.eq(bo.getMasterId() != null, XzdBqglRyrm::getMasterId, bo.getMasterId());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdBqglRyrm::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getProjectNumber()), XzdBqglRyrm::getProjectNumber, bo.getProjectNumber());
lqw.eq(StringUtils.isNotBlank(bo.getRyNumber()), XzdBqglRyrm::getRyNumber, bo.getRyNumber());
lqw.eq(bo.getProjectTypeId() != null, XzdBqglRyrm::getProjectTypeId, bo.getProjectTypeId());
lqw.eq(bo.getBillDate() != null, XzdBqglRyrm::getBillDate, bo.getBillDate());
return lqw;
@ -108,6 +120,8 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl<XzdBqglRyrmMapper, XzdBq
public Boolean insertByBo(XzdBqglRyrmBo bo) {
XzdBqglRyrm add = MapstructUtils.convert(bo, XzdBqglRyrm.class);
validEntityBeforeSave(add);
String banBen = BatchNumberGenerator.generateBatchNumber("RYRM-");
add.setRyNumber(banBen);
boolean flag = baseMapper.insert(add) > 0;
if (bo.getRmxxBoList() != null && bo.getRmxxBoList().size() > 0){
bo.getRmxxBoList().forEach(rmxxBo -> rmxxBo.setMasterId(add.getId()));