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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
re-JZzzz
2025-08-29 20:02:16 +08:00
parent 642d5c73ca d7054d6f02
commit b1c21b1f88
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java
View File

@ -108,7 +108,7 @@ public class DesSchemeController extends BaseController {
/** /**
* 新增设计方案文件 * 新增设计方案文件
*/ */
@SaCheckPermission("design:scheme:add") @SaCheckPermission("design:scheme:upload")
@Log(title = "设计方案", businessType = BusinessType.INSERT) @Log(title = "设计方案", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/upload") @PostMapping("/upload")
@ -119,7 +119,7 @@ public class DesSchemeController extends BaseController {
/** /**
* 修改设计方案文件 * 修改设计方案文件
*/ */
@SaCheckPermission("design:scheme:edit") @SaCheckPermission("design:scheme:update")
@Log(title = "设计方案", businessType = BusinessType.UPDATE) @Log(title = "设计方案", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/update/{id}") @PostMapping("/update/{id}")

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
View File

@ -25,6 +25,7 @@ import org.dromara.out.service.IOutConstructionValueService;
import org.dromara.progress.domain.PgsProgressCategory; import org.dromara.progress.domain.PgsProgressCategory;
import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo; import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo;
import org.dromara.progress.service.IPgsProgressCategoryService; import org.dromara.progress.service.IPgsProgressCategoryService;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.vo.project.BusProjectVo; import org.dromara.project.domain.vo.project.BusProjectVo;
import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectService;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
@ -54,6 +55,8 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
private final IPgsProgressCategoryService pgsProgressCategoryService; private final IPgsProgressCategoryService pgsProgressCategoryService;
private final IBusProjectService projectService;
/** /**
* 查询施工产值 * 查询施工产值
* *
@ -100,7 +103,14 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(OutConstructionValue::getId); lqw.orderByDesc(OutConstructionValue::getId);
lqw.eq(bo.getProjectId() != null, OutConstructionValue::getProjectId, bo.getProjectId()); Long projectId = bo.getProjectId();
if (projectId != null) {
// 获取子项目列表
List<BusProject> subProjectIds = projectService.lambdaQuery()
.eq(BusProject::getPId, projectId)
.list();
lqw.in(OutConstructionValue::getProjectId, projectId, subProjectIds);
}
lqw.eq(bo.getMatrixId() != null, OutConstructionValue::getMatrixId, bo.getMatrixId()); lqw.eq(bo.getMatrixId() != null, OutConstructionValue::getMatrixId, bo.getMatrixId());
lqw.eq(bo.getProgressCategoryId() != null, OutConstructionValue::getProgressCategoryId, bo.getProgressCategoryId()); lqw.eq(bo.getProgressCategoryId() != null, OutConstructionValue::getProgressCategoryId, bo.getProgressCategoryId());
lqw.eq(bo.getArtificialNum() != null, OutConstructionValue::getArtificialNum, bo.getArtificialNum()); lqw.eq(bo.getArtificialNum() != null, OutConstructionValue::getArtificialNum, bo.getArtificialNum());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
View File

@ -63,7 +63,6 @@ public class BusUserProjectRelevancyController extends BaseController {
/** /**
* 查询登录用户与项目关联分页 * 查询登录用户与项目关联分页
*/ */
@SaCheckPermission("project:projectRelevancy:loginPage")
@GetMapping("/login/page") @GetMapping("/login/page")
public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) { public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java
View File

@ -128,7 +128,7 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
lqw.eq(bo.getPrice() != null, BusBiddingPlan::getPrice, bo.getPrice()); lqw.eq(bo.getPrice() != null, BusBiddingPlan::getPrice, bo.getPrice());
lqw.eq(bo.getContractPrice() != null, BusBiddingPlan::getContractPrice, bo.getContractPrice()); lqw.eq(bo.getContractPrice() != null, BusBiddingPlan::getContractPrice, bo.getContractPrice());
lqw.eq(StringUtils.isNotBlank(bo.getContent()), BusBiddingPlan::getContent, bo.getContent()); lqw.eq(StringUtils.isNotBlank(bo.getContent()), BusBiddingPlan::getContent, bo.getContent());
lqw.eq((bo.getStatus()!= null), BusBiddingPlan::getStatus, bo.getStatus()); lqw.isNotNull(("1".equals(bo.getStatus())), BusBiddingPlan::getWinningBidderId);
return lqw; return lqw;
} }