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

误删除

Browse Source
This commit is contained in:
lg
2025-10-10 20:59:39 +08:00
parent 412db4d348
commit 22a7500048
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/controller/XzdProjectRiskAssessmentController.java
View File

@ -7,8 +7,8 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo;
import org.dromara.xzd.biddingManagement.service.IXzdProjectRiskAssessmentService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@ -42,7 +42,7 @@ public class XzdProjectRiskAssessmentController extends BaseController {
*/
@SaCheckPermission("xzd:projectRiskAssessment:list")
@GetMapping("/list")
public TableDataInfo<XzdProjectRiskAssessmentVo> list(XzdProjectVo bo, PageQuery pageQuery) {
public TableDataInfo<XzdProjectRiskAssessmentVo> list(XzdProjectByVo bo, PageQuery pageQuery) {
return xzdProjectRiskAssessmentService.queryPageList(bo, pageQuery);
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/dto/BiddingManagementDto.java
View File

@ -7,7 +7,11 @@ import org.dromara.xzd.biddingManagement.domain.bo.XzdBqlxProjectInfoBo;
@Data
public class BiddingManagementDto {
// 标前立项
private XzdBidPreProjectBo xzdBidPreProjectBo;
// 标前立项-项目信息
private XzdBqlxProjectInfoBo xzdBqlxProjectInfoBo;
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectVo.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectByVo.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
import java.time.LocalDateTime;
@Data
public class XzdProjectVo {
public class XzdProjectByVo {
/**
* 单据编号

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/IXzdProjectRiskAssessmentService.java
View File

@ -7,8 +7,8 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.xzd.biddingManagement.domain.XzdProjectRiskAssessment;
import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo;
import java.util.Collection;
import java.util.List;
@ -36,7 +36,7 @@ public interface IXzdProjectRiskAssessmentService extends IService<XzdProjectRis
* @param pageQuery 分页参数
* @return 项目风险评估签审意见分页列表
*/
TableDataInfo<XzdProjectRiskAssessmentVo> queryPageList(XzdProjectVo bo, PageQuery pageQuery);
TableDataInfo<XzdProjectRiskAssessmentVo> queryPageList(XzdProjectByVo bo, PageQuery pageQuery);
/**
* 查询符合条件的项目风险评估签审意见列表

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/impl/XzdProjectRiskAssessmentServiceImpl.java
View File

@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.xzd.biddingManagement.domain.XzdProjectRiskAssessment;
import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo;
import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo;
import org.dromara.xzd.biddingManagement.mapper.XzdProjectRiskAssessmentMapper;
import org.dromara.xzd.biddingManagement.service.IXzdProjectRiskAssessmentService;
import org.dromara.xzd.utilS.AreaUtil;
@ -57,7 +57,7 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl<XzdProjectR
* @return 项目风险评估签审意见分页列表
*/
@Override
public TableDataInfo<XzdProjectRiskAssessmentVo> queryPageList(XzdProjectVo bo, PageQuery pageQuery) {
public TableDataInfo<XzdProjectRiskAssessmentVo> queryPageList(XzdProjectByVo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdProjectRiskAssessment> lqw = buildQueryWrapper1(bo);
Page<XzdProjectRiskAssessmentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
@ -104,7 +104,7 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl<XzdProjectR
private LambdaQueryWrapper<XzdProjectRiskAssessment> buildQueryWrapper1(XzdProjectVo bo) {
private LambdaQueryWrapper<XzdProjectRiskAssessment> buildQueryWrapper1(XzdProjectByVo bo) {
LambdaQueryWrapper<XzdProjectRiskAssessment> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdProjectRiskAssessment::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdProjectRiskAssessment::getDocumentNumber, bo.getDocumentNumber());

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java
View File

@ -11,7 +11,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -65,5 +65,9 @@ public class XzdCustomertypeVo implements Serializable {
@ExcelProperty(value = "客户类型")
private String customerType;
/**
* 子节点
*/
List<XzdCustomertypeVo> children;
}