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:
青云
2025-08-20 16:45:23 +08:00
parent 30d17b3051 4622875948
commit 8ae7de2908
61 changed files with 3627 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -288,3 +288,6 @@ id-card:
encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
recognizer:
url: http://192.168.110.5:50070
qrCode:
url: http://192.168.110.151:7788

3
xinnengyuan/ruoyi-admin/src/main/resources/application-local.yml
View File

@ -287,3 +287,6 @@ id-card:
encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
recognizer:
url: http://192.168.110.5:50070
qrCode:
url: http://192.168.110.151:7788

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialbatchdemandplan.java
View File

@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -87,7 +89,7 @@ public class BusMaterialbatchdemandplan extends BaseEntity {
/**
* 需求数量
*/
private Long demandQuantity;
private BigDecimal demandQuantity;
/**
* 计划到场时间

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java
View File

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@ -90,7 +91,7 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
/**
* 需求数量
*/
private Long demandQuantity;
private BigDecimal demandQuantity;
/**
* 计划到场时间

52
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/PdfBoxQrCodeGenerator.java
View File

@ -248,30 +248,30 @@ public class PdfBoxQrCodeGenerator {
}
// public static void main(String[] args) {
// String path = "C:\\Users\\YuanJie\\Desktop\\test.pdf";
// String outputPath = "C:\\Users\\YuanJie\\Desktop\\test1.pdf";
//
// String params = "ID：[" + 11111 + "] finish";
// byte[] bytes = PdfBoxQrCodeGenerator.generateQRCodeBytes(params);
//
// try {
// System.out.println("二维码字节大小: " + bytes.length + " 字节");
//
// // 在每一页添加二维码
// ByteArrayOutputStream byteArrayOutputStream = PdfBoxQrCodeGenerator.addQRCodeToPDFOnAllPages(path, bytes,true);
//
// // 将输出流写入到指定文件
// try (FileOutputStream fileOut = new FileOutputStream(outputPath)) {
// byteArrayOutputStream.writeTo(fileOut);
// }
//
// System.out.println("PDF文件已成功生成到: " + outputPath);
// System.out.println("生成的PDF大小: " + new File(outputPath).length() + " 字节");
//
// } catch (Exception e) {
// e.printStackTrace();
// System.out.println("图纸管理 => 审核结束，向文件添加二维码失败， 错误");
// }
// }
public static void main(String[] args) {
String path = "C:\\Users\\YuanJie\\Desktop\\test.pdf";
String outputPath = "C:\\Users\\YuanJie\\Desktop\\test1.pdf";
String params = "http://192.168.110.151:7788/codeDetail?id="+"1957649652924448769";
byte[] bytes = PdfBoxQrCodeGenerator.generateQRCodeBytes(params);
try {
System.out.println("二维码字节大小: " + bytes.length + " 字节");
// 在每一页添加二维码
ByteArrayOutputStream byteArrayOutputStream = PdfBoxQrCodeGenerator.addQRCodeToPDFOnAllPages(path, bytes,false);
// 将输出流写入到指定文件
try (FileOutputStream fileOut = new FileOutputStream(outputPath)) {
byteArrayOutputStream.writeTo(fileOut);
}
System.out.println("PDF文件已成功生成到: " + outputPath);
System.out.println("生成的PDF大小: " + new File(outputPath).length() + " 字节");
} catch (Exception e) {
e.printStackTrace();
System.out.println("图纸管理 => 审核结束，向文件添加二维码失败， 错误");
}
}
}

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.ctr.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
import org.dromara.ctr.domain.bo.CtrExpensesContractBo;
import org.dromara.ctr.service.ICtrExpensesContractService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 支出合同
*
* @author Lion Li
* @date 2025-08-20
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/ctr/expensesContract")
public class CtrExpensesContractController extends BaseController {
private final ICtrExpensesContractService ctrExpensesContractService;
/**
* 查询支出合同列表
*/
@SaCheckPermission("ctr:expensesContract:list")
@GetMapping("/list")
public TableDataInfo<CtrExpensesContractVo> list(CtrExpensesContractBo bo, PageQuery pageQuery) {
return ctrExpensesContractService.queryPageList(bo, pageQuery);
}
/**
* 导出支出合同列表
*/
@SaCheckPermission("ctr:expensesContract:export")
@Log(title = "支出合同", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CtrExpensesContractBo bo, HttpServletResponse response) {
List<CtrExpensesContractVo> list = ctrExpensesContractService.queryList(bo);
ExcelUtil.exportExcel(list, "支出合同", CtrExpensesContractVo.class, response);
}
/**
* 获取支出合同详细信息
*
* @param id 主键
*/
@SaCheckPermission("ctr:expensesContract:query")
@GetMapping("/{id}")
public R<CtrExpensesContractVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ctrExpensesContractService.queryById(id));
}
/**
* 新增支出合同
*/
@SaCheckPermission("ctr:expensesContract:add")
@Log(title = "支出合同", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CtrExpensesContractBo bo) {
return toAjax(ctrExpensesContractService.insertByBo(bo));
}
/**
* 修改支出合同
*/
@SaCheckPermission("ctr:expensesContract:edit")
@Log(title = "支出合同", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CtrExpensesContractBo bo) {
return toAjax(ctrExpensesContractService.updateByBo(bo));
}
/**
* 删除支出合同
*
* @param ids 主键串
*/
@SaCheckPermission("ctr:expensesContract:remove")
@Log(title = "支出合同", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(ctrExpensesContractService.deleteWithValidByIds(List.of(ids), true));
}
}

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrFileController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.ctr.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.ctr.domain.vo.CtrFileVo;
import org.dromara.ctr.domain.bo.CtrFileBo;
import org.dromara.ctr.service.ICtrFileService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 合同附件
*
* @author Lion Li
* @date 2025-08-20
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/ctr/file")
public class CtrFileController extends BaseController {
private final ICtrFileService ctrFileService;
/**
* 查询合同附件列表
*/
@SaCheckPermission("ctr:file:list")
@GetMapping("/list")
public TableDataInfo<CtrFileVo> list(CtrFileBo bo, PageQuery pageQuery) {
return ctrFileService.queryPageList(bo, pageQuery);
}
/**
* 导出合同附件列表
*/
@SaCheckPermission("ctr:file:export")
@Log(title = "合同附件", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CtrFileBo bo, HttpServletResponse response) {
List<CtrFileVo> list = ctrFileService.queryList(bo);
ExcelUtil.exportExcel(list, "合同附件", CtrFileVo.class, response);
}
/**
* 获取合同附件详细信息
*
* @param id 主键
*/
@SaCheckPermission("ctr:file:query")
@GetMapping("/{id}")
public R<CtrFileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ctrFileService.queryById(id));
}
/**
* 新增合同附件
*/
@SaCheckPermission("ctr:file:add")
@Log(title = "合同附件", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CtrFileBo bo) {
return toAjax(ctrFileService.insertByBo(bo));
}
/**
* 修改合同附件
*/
@SaCheckPermission("ctr:file:edit")
@Log(title = "合同附件", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CtrFileBo bo) {
return toAjax(ctrFileService.updateByBo(bo));
}
/**
* 删除合同附件
*
* @param ids 主键串
*/
@SaCheckPermission("ctr:file:remove")
@Log(title = "合同附件", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(ctrFileService.deleteWithValidByIds(List.of(ids), true));
}
}

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrIncomeContractController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.ctr.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
import org.dromara.ctr.domain.bo.CtrIncomeContractBo;
import org.dromara.ctr.service.ICtrIncomeContractService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 收入合同
*
* @author Lion Li
* @date 2025-08-20
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/ctr/incomeContract")
public class CtrIncomeContractController extends BaseController {
private final ICtrIncomeContractService ctrIncomeContractService;
/**
* 查询收入合同列表
*/
@SaCheckPermission("ctr:incomeContract:list")
@GetMapping("/list")
public TableDataInfo<CtrIncomeContractVo> list(CtrIncomeContractBo bo, PageQuery pageQuery) {
return ctrIncomeContractService.queryPageList(bo, pageQuery);
}
/**
* 导出收入合同列表
*/
@SaCheckPermission("ctr:incomeContract:export")
@Log(title = "收入合同", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CtrIncomeContractBo bo, HttpServletResponse response) {
List<CtrIncomeContractVo> list = ctrIncomeContractService.queryList(bo);
ExcelUtil.exportExcel(list, "收入合同", CtrIncomeContractVo.class, response);
}
/**
* 获取收入合同详细信息
*
* @param id 主键
*/
@SaCheckPermission("ctr:incomeContract:query")
@GetMapping("/{id}")
public R<CtrIncomeContractVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ctrIncomeContractService.queryById(id));
}
/**
* 新增收入合同
*/
@SaCheckPermission("ctr:incomeContract:add")
@Log(title = "收入合同", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CtrIncomeContractBo bo) {
return toAjax(ctrIncomeContractService.insertByBo(bo));
}
/**
* 修改收入合同
*/
@SaCheckPermission("ctr:incomeContract:edit")
@Log(title = "收入合同", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CtrIncomeContractBo bo) {
return toAjax(ctrIncomeContractService.updateByBo(bo));
}
/**
* 删除收入合同
*
* @param ids 主键串
*/
@SaCheckPermission("ctr:incomeContract:remove")
@Log(title = "收入合同", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(ctrIncomeContractService.deleteWithValidByIds(List.of(ids), true));
}
}

72
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java Normal file
View File

@ -0,0 +1,72 @@
package org.dromara.ctr.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* 支出合同对象 ctr_expenses_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ctr_expenses_contract")
public class CtrExpensesContract extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目ID
*/
private Long projectId;
/**
* 合同编号
*/
private String contractCode;
/**
* 合同类型
*/
private String contractType;
/**
* 供应商
*/
private String contractSupplier;
/**
* 分包内容
*/
private String contractedContent;
/**
* 合同金额
*/
private BigDecimal amount;
/**
* 招标Id
*/
private Long tenderId;
/**
* 备注
*/
private String remark;
}

56
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrFile.java Normal file
View File

@ -0,0 +1,56 @@
package org.dromara.ctr.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 合同附件对象 ctr_file
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ctr_file")
public class CtrFile extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 合同ID
*/
private Long contractId;
/**
* 文件名称
*/
private String fileName;
/**
* 文件地址
*/
private String fileUrl;
/**
* 文件ID
*/
private Long ossId;
/**
* 备注
*/
private String remark;
}

67
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java Normal file
View File

@ -0,0 +1,67 @@
package org.dromara.ctr.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* 收入合同对象 ctr_income_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ctr_income_contract")
public class CtrIncomeContract extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目ID
*/
private Long projectId;
/**
* 合同编号
*/
private String contractCode;
/**
* 合同类型
*/
private String contractType;
/**
* 业主单位
*/
private String contractOwner;
/**
* 承包内容
*/
private String contractedContent;
/**
* 合同金额
*/
private BigDecimal amount;
/**
* 备注
*/
private String remark;
}

78
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java Normal file
View File

@ -0,0 +1,78 @@
package org.dromara.ctr.domain.bo;
import org.dromara.ctr.domain.CtrExpensesContract;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.List;
/**
* 支出合同业务对象 ctr_expenses_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = CtrExpensesContract.class, reverseConvertGenerate = false)
public class CtrExpensesContractBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 合同编号
*/
private String contractCode;
/**
* 合同类型
*/
private String contractType;
/**
* 供应商
*/
private String contractSupplier;
/**
* 分包内容
*/
private String contractedContent;
/**
* 合同金额
*/
private BigDecimal amount;
/**
* 招标Id
*/
private Long tenderId;
/**
* 备注
*/
private String remark;
/**
* 附件
*/
private List<CtrFileBo> fileList;
}

59
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrFileBo.java Normal file
View File

@ -0,0 +1,59 @@
package org.dromara.ctr.domain.bo;
import org.dromara.ctr.domain.CtrFile;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 合同附件业务对象 ctr_file
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = CtrFile.class, reverseConvertGenerate = false)
public class CtrFileBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 合同ID
*/
@NotNull(message = "合同ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long contractId;
/**
* 文件名称
*/
@NotBlank(message = "文件名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileName;
/**
* 文件地址
*/
@NotBlank(message = "文件地址不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileUrl;
/**
* 文件ID
*/
@NotNull(message = "文件ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long ossId;
/**
* 备注
*/
private String remark;
}

71
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java Normal file
View File

@ -0,0 +1,71 @@
package org.dromara.ctr.domain.bo;
import org.dromara.ctr.domain.CtrIncomeContract;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.List;
/**
* 收入合同业务对象 ctr_income_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = CtrIncomeContract.class, reverseConvertGenerate = false)
public class CtrIncomeContractBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 合同编号
*/
private String contractCode;
/**
* 合同类型
*/
private String contractType;
/**
* 业主单位
*/
private String contractOwner;
/**
* 承包内容
*/
private String contractedContent;
/**
* 合同金额
*/
private BigDecimal amount;
/**
* 备注
*/
private String remark;
/**
* 附件
*/
private List<CtrFileBo> fileList;
}

87
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java Normal file
View File

@ -0,0 +1,87 @@
package org.dromara.ctr.domain.vo;
import java.math.BigDecimal;
import org.dromara.ctr.domain.CtrExpensesContract;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 支出合同视图对象 ctr_expenses_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CtrExpensesContract.class)
public class CtrExpensesContractVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 合同编号
*/
@ExcelProperty(value = "合同编号")
private String contractCode;
/**
* 合同类型
*/
@ExcelProperty(value = "合同类型")
private String contractType;
/**
* 供应商
*/
@ExcelProperty(value = "供应商")
private String contractSupplier;
/**
* 分包内容
*/
@ExcelProperty(value = "分包内容")
private String contractedContent;
/**
* 合同金额
*/
@ExcelProperty(value = "合同金额")
private BigDecimal amount;
/**
* 招标Id
*/
@ExcelProperty(value = "招标Id")
private Long tenderId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

68
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrFileVo.java Normal file
View File

@ -0,0 +1,68 @@
package org.dromara.ctr.domain.vo;
import org.dromara.ctr.domain.CtrFile;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 合同附件视图对象 ctr_file
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CtrFile.class)
public class CtrFileVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 合同ID
*/
@ExcelProperty(value = "合同ID")
private Long contractId;
/**
* 文件名称
*/
@ExcelProperty(value = "文件名称")
private String fileName;
/**
* 文件地址
*/
@ExcelProperty(value = "文件地址")
private String fileUrl;
/**
* 文件ID
*/
@ExcelProperty(value = "文件ID")
private Long ossId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

81
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java Normal file
View File

@ -0,0 +1,81 @@
package org.dromara.ctr.domain.vo;
import java.math.BigDecimal;
import org.dromara.ctr.domain.CtrIncomeContract;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 收入合同视图对象 ctr_income_contract
*
* @author Lion Li
* @date 2025-08-20
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CtrIncomeContract.class)
public class CtrIncomeContractVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 合同编号
*/
@ExcelProperty(value = "合同编号")
private String contractCode;
/**
* 合同类型
*/
@ExcelProperty(value = "合同类型")
private String contractType;
/**
* 业主单位
*/
@ExcelProperty(value = "业主单位")
private String contractOwner;
/**
* 承包内容
*/
@ExcelProperty(value = "承包内容")
private String contractedContent;
/**
* 合同金额
*/
@ExcelProperty(value = "合同金额")
private BigDecimal amount;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrExpensesContractMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.ctr.mapper;
import org.dromara.ctr.domain.CtrExpensesContract;
import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 支出合同Mapper接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface CtrExpensesContractMapper extends BaseMapperPlus<CtrExpensesContract, CtrExpensesContractVo> {
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrFileMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.ctr.mapper;
import org.dromara.ctr.domain.CtrFile;
import org.dromara.ctr.domain.vo.CtrFileVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 合同附件Mapper接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface CtrFileMapper extends BaseMapperPlus<CtrFile, CtrFileVo> {
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrIncomeContractMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.ctr.mapper;
import org.dromara.ctr.domain.CtrIncomeContract;
import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 收入合同Mapper接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface CtrIncomeContractMapper extends BaseMapperPlus<CtrIncomeContract, CtrIncomeContractVo> {
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrExpensesContractService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.ctr.service;
import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
import org.dromara.ctr.domain.bo.CtrExpensesContractBo;
import org.dromara.ctr.domain.CtrExpensesContract;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 支出合同Service接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface ICtrExpensesContractService extends IService<CtrExpensesContract>{
/**
* 查询支出合同
*
* @param id 主键
* @return 支出合同
*/
CtrExpensesContractVo queryById(Long id);
/**
* 分页查询支出合同列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 支出合同分页列表
*/
TableDataInfo<CtrExpensesContractVo> queryPageList(CtrExpensesContractBo bo, PageQuery pageQuery);
/**
* 查询符合条件的支出合同列表
*
* @param bo 查询条件
* @return 支出合同列表
*/
List<CtrExpensesContractVo> queryList(CtrExpensesContractBo bo);
/**
* 新增支出合同
*
* @param bo 支出合同
* @return 是否新增成功
*/
Boolean insertByBo(CtrExpensesContractBo bo);
/**
* 修改支出合同
*
* @param bo 支出合同
* @return 是否修改成功
*/
Boolean updateByBo(CtrExpensesContractBo bo);
/**
* 校验并批量删除支出合同信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrFileService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.ctr.service;
import org.dromara.ctr.domain.vo.CtrFileVo;
import org.dromara.ctr.domain.bo.CtrFileBo;
import org.dromara.ctr.domain.CtrFile;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 合同附件Service接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface ICtrFileService extends IService<CtrFile>{
/**
* 查询合同附件
*
* @param id 主键
* @return 合同附件
*/
CtrFileVo queryById(Long id);
/**
* 分页查询合同附件列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 合同附件分页列表
*/
TableDataInfo<CtrFileVo> queryPageList(CtrFileBo bo, PageQuery pageQuery);
/**
* 查询符合条件的合同附件列表
*
* @param bo 查询条件
* @return 合同附件列表
*/
List<CtrFileVo> queryList(CtrFileBo bo);
/**
* 新增合同附件
*
* @param bo 合同附件
* @return 是否新增成功
*/
Boolean insertByBo(CtrFileBo bo);
/**
* 修改合同附件
*
* @param bo 合同附件
* @return 是否修改成功
*/
Boolean updateByBo(CtrFileBo bo);
/**
* 校验并批量删除合同附件信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrIncomeContractService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.ctr.service;
import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
import org.dromara.ctr.domain.bo.CtrIncomeContractBo;
import org.dromara.ctr.domain.CtrIncomeContract;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 收入合同Service接口
*
* @author Lion Li
* @date 2025-08-20
*/
public interface ICtrIncomeContractService extends IService<CtrIncomeContract>{
/**
* 查询收入合同
*
* @param id 主键
* @return 收入合同
*/
CtrIncomeContractVo queryById(Long id);
/**
* 分页查询收入合同列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 收入合同分页列表
*/
TableDataInfo<CtrIncomeContractVo> queryPageList(CtrIncomeContractBo bo, PageQuery pageQuery);
/**
* 查询符合条件的收入合同列表
*
* @param bo 查询条件
* @return 收入合同列表
*/
List<CtrIncomeContractVo> queryList(CtrIncomeContractBo bo);
/**
* 新增收入合同
*
* @param bo 收入合同
* @return 是否新增成功
*/
Boolean insertByBo(CtrIncomeContractBo bo);
/**
* 修改收入合同
*
* @param bo 收入合同
* @return 是否修改成功
*/
Boolean updateByBo(CtrIncomeContractBo bo);
/**
* 校验并批量删除收入合同信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

137
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java Normal file
View File

@ -0,0 +1,137 @@
package org.dromara.ctr.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.ctr.domain.bo.CtrExpensesContractBo;
import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
import org.dromara.ctr.domain.CtrExpensesContract;
import org.dromara.ctr.mapper.CtrExpensesContractMapper;
import org.dromara.ctr.service.ICtrExpensesContractService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 支出合同Service业务层处理
*
* @author Lion Li
* @date 2025-08-20
*/
@RequiredArgsConstructor
@Service
public class CtrExpensesContractServiceImpl extends ServiceImpl<CtrExpensesContractMapper, CtrExpensesContract> implements ICtrExpensesContractService {
private final CtrExpensesContractMapper baseMapper;
/**
* 查询支出合同
*
* @param id 主键
* @return 支出合同
*/
@Override
public CtrExpensesContractVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询支出合同列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 支出合同分页列表
*/
@Override
public TableDataInfo<CtrExpensesContractVo> queryPageList(CtrExpensesContractBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CtrExpensesContract> lqw = buildQueryWrapper(bo);
Page<CtrExpensesContractVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的支出合同列表
*
* @param bo 查询条件
* @return 支出合同列表
*/
@Override
public List<CtrExpensesContractVo> queryList(CtrExpensesContractBo bo) {
LambdaQueryWrapper<CtrExpensesContract> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CtrExpensesContract> buildQueryWrapper(CtrExpensesContractBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CtrExpensesContract> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(CtrExpensesContract::getId);
lqw.eq(bo.getProjectId() != null, CtrExpensesContract::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), CtrExpensesContract::getContractCode, bo.getContractCode());
lqw.eq(StringUtils.isNotBlank(bo.getContractType()), CtrExpensesContract::getContractType, bo.getContractType());
lqw.eq(StringUtils.isNotBlank(bo.getContractSupplier()), CtrExpensesContract::getContractSupplier, bo.getContractSupplier());
lqw.eq(StringUtils.isNotBlank(bo.getContractedContent()), CtrExpensesContract::getContractedContent, bo.getContractedContent());
lqw.eq(bo.getAmount() != null, CtrExpensesContract::getAmount, bo.getAmount());
lqw.eq(bo.getTenderId() != null, CtrExpensesContract::getTenderId, bo.getTenderId());
return lqw;
}
/**
* 新增支出合同
*
* @param bo 支出合同
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(CtrExpensesContractBo bo) {
CtrExpensesContract add = MapstructUtils.convert(bo, CtrExpensesContract.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改支出合同
*
* @param bo 支出合同
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(CtrExpensesContractBo bo) {
CtrExpensesContract update = MapstructUtils.convert(bo, CtrExpensesContract.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CtrExpensesContract entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除支出合同信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

134
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrFileServiceImpl.java Normal file
View File

@ -0,0 +1,134 @@
package org.dromara.ctr.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.ctr.domain.bo.CtrFileBo;
import org.dromara.ctr.domain.vo.CtrFileVo;
import org.dromara.ctr.domain.CtrFile;
import org.dromara.ctr.mapper.CtrFileMapper;
import org.dromara.ctr.service.ICtrFileService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 合同附件Service业务层处理
*
* @author Lion Li
* @date 2025-08-20
*/
@RequiredArgsConstructor
@Service
public class CtrFileServiceImpl extends ServiceImpl<CtrFileMapper, CtrFile> implements ICtrFileService {
private final CtrFileMapper baseMapper;
/**
* 查询合同附件
*
* @param id 主键
* @return 合同附件
*/
@Override
public CtrFileVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询合同附件列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 合同附件分页列表
*/
@Override
public TableDataInfo<CtrFileVo> queryPageList(CtrFileBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CtrFile> lqw = buildQueryWrapper(bo);
Page<CtrFileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的合同附件列表
*
* @param bo 查询条件
* @return 合同附件列表
*/
@Override
public List<CtrFileVo> queryList(CtrFileBo bo) {
LambdaQueryWrapper<CtrFile> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CtrFile> buildQueryWrapper(CtrFileBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CtrFile> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(CtrFile::getId);
lqw.eq(bo.getContractId() != null, CtrFile::getContractId, bo.getContractId());
lqw.like(StringUtils.isNotBlank(bo.getFileName()), CtrFile::getFileName, bo.getFileName());
lqw.eq(StringUtils.isNotBlank(bo.getFileUrl()), CtrFile::getFileUrl, bo.getFileUrl());
lqw.eq(bo.getOssId() != null, CtrFile::getOssId, bo.getOssId());
return lqw;
}
/**
* 新增合同附件
*
* @param bo 合同附件
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(CtrFileBo bo) {
CtrFile add = MapstructUtils.convert(bo, CtrFile.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改合同附件
*
* @param bo 合同附件
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(CtrFileBo bo) {
CtrFile update = MapstructUtils.convert(bo, CtrFile.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CtrFile entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除合同附件信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

136
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrIncomeContractServiceImpl.java Normal file
View File

@ -0,0 +1,136 @@
package org.dromara.ctr.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.ctr.domain.bo.CtrIncomeContractBo;
import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
import org.dromara.ctr.domain.CtrIncomeContract;
import org.dromara.ctr.mapper.CtrIncomeContractMapper;
import org.dromara.ctr.service.ICtrIncomeContractService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 收入合同Service业务层处理
*
* @author Lion Li
* @date 2025-08-20
*/
@RequiredArgsConstructor
@Service
public class CtrIncomeContractServiceImpl extends ServiceImpl<CtrIncomeContractMapper, CtrIncomeContract> implements ICtrIncomeContractService {
private final CtrIncomeContractMapper baseMapper;
/**
* 查询收入合同
*
* @param id 主键
* @return 收入合同
*/
@Override
public CtrIncomeContractVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询收入合同列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 收入合同分页列表
*/
@Override
public TableDataInfo<CtrIncomeContractVo> queryPageList(CtrIncomeContractBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CtrIncomeContract> lqw = buildQueryWrapper(bo);
Page<CtrIncomeContractVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的收入合同列表
*
* @param bo 查询条件
* @return 收入合同列表
*/
@Override
public List<CtrIncomeContractVo> queryList(CtrIncomeContractBo bo) {
LambdaQueryWrapper<CtrIncomeContract> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CtrIncomeContract> buildQueryWrapper(CtrIncomeContractBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CtrIncomeContract> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(CtrIncomeContract::getId);
lqw.eq(bo.getProjectId() != null, CtrIncomeContract::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), CtrIncomeContract::getContractCode, bo.getContractCode());
lqw.eq(StringUtils.isNotBlank(bo.getContractType()), CtrIncomeContract::getContractType, bo.getContractType());
lqw.eq(StringUtils.isNotBlank(bo.getContractOwner()), CtrIncomeContract::getContractOwner, bo.getContractOwner());
lqw.eq(StringUtils.isNotBlank(bo.getContractedContent()), CtrIncomeContract::getContractedContent, bo.getContractedContent());
lqw.eq(bo.getAmount() != null, CtrIncomeContract::getAmount, bo.getAmount());
return lqw;
}
/**
* 新增收入合同
*
* @param bo 收入合同
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(CtrIncomeContractBo bo) {
CtrIncomeContract add = MapstructUtils.convert(bo, CtrIncomeContract.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改收入合同
*
* @param bo 收入合同
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(CtrIncomeContractBo bo) {
CtrIncomeContract update = MapstructUtils.convert(bo, CtrIncomeContract.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CtrIncomeContract entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除收入合同信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DesCollectFileVo.java
View File

@ -71,5 +71,13 @@ public class DesCollectFileVo implements Serializable {
@ExcelProperty(value = "审核状态")
private String status;
/**
* 图纸类型(1-过程，3-蓝图，4-作废)
*/
private String type;
/**
* 版本号
*/
private String version;
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java
View File

@ -12,6 +12,7 @@ import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@ -101,7 +102,7 @@ public class DesVolumeCatalogVo implements Serializable {
/**
* 创建时间
*/
private LocalDate createTime;
private Date createTime;
/**
* 文件列表

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumefile/DesVolumeFileCodeVo.java
View File

@ -71,4 +71,13 @@ public class DesVolumeFileCodeVo implements Serializable {
*/
private String fileUrl;
/**
* 图纸类型(1-过程，3-蓝图，4-作废)
*/
private String type;
/**
* 是否最新
*/
private Boolean isLatest;
}

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

@ -424,7 +424,7 @@ public class DesDesignChangeServiceImpl extends ServiceImpl<DesDesignChangeMappe
String volumeName = req.getVolumeName();
String volumeNo = req.getVolumeNo();
String status = req.getStatus();
lqw.orderByDesc(DesDesignChange::getId);
lqw.orderByDesc(DesDesignChange::getCreateTime);
lqw.eq(ObjectUtils.isNotEmpty(projectId), DesDesignChange::getProjectId, projectId);
lqw.eq(ObjectUtils.isNotEmpty(formNo), DesDesignChange::getFormNo, formNo);
lqw.eq(ObjectUtils.isNotEmpty(submitDate), DesDesignChange::getSubmitDate, submitDate);

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDrawingServiceImpl.java
View File

@ -40,6 +40,7 @@ import org.dromara.project.service.IBusProjectService;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
@ -87,6 +88,9 @@ public class DesDrawingServiceImpl extends ServiceImpl<DesDrawingMapper, DesDraw
@Resource
private IDesVolumeFileService volumeFilesService;
@Value("${qrCode.url}")
private String qrCodeUrL;
/**
* 查询图纸管理
*
@ -439,7 +443,7 @@ public class DesDrawingServiceImpl extends ServiceImpl<DesDrawingMapper, DesDraw
}
SysOssVo ossVo = ossService.getById(fileUrl);
// 整合二维码需要显示的数据
String params = "ID：[" + byId.getId() + "] finish";
String params = qrCodeUrL+"/codeDetail?id="+volumeFileId;
byte[] bytes = PdfBoxQrCodeGenerator.generateQRCodeBytes(params);
try {
ByteArrayOutputStream baos = PdfBoxQrCodeGenerator.addQRCodeToPDFOnAllPages(ossVo.getUrl(), bytes,isChangeFile);

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesExtractServiceImpl.java
View File

@ -39,6 +39,7 @@ import org.dromara.design.service.IDesCollectFileService;
import org.dromara.design.service.IDesExtractCatalogueService;
import org.dromara.design.service.IDesVolumeFileService;
import org.dromara.project.service.IBusProjectService;
import org.dromara.system.service.ISysOssService;
import org.springframework.beans.BeanUtils;
import org.springframework.context.event.EventListener;
import org.springframework.http.MediaType;
@ -82,6 +83,7 @@ public class DesExtractServiceImpl extends ServiceImpl<DesExtractMapper, DesExtr
private final IDesVolumeFileService volumeFileService;
private final ISysOssService ossService;
/**
* 查询提资清单
*
@ -293,10 +295,17 @@ public class DesExtractServiceImpl extends ServiceImpl<DesExtractMapper, DesExtr
public List<DesCollectFileVo> fileList(Long id) {
List<Long> catalogIds = extractCatalogueService.list(Wrappers.<DesExtractCatalogue>lambdaQuery()
.eq(DesExtractCatalogue::getExtractId, id)).stream().map(DesExtractCatalogue::getVolumeCatalogId).toList();
DesCollectFileBo desCollectFileBo = new DesCollectFileBo();
desCollectFileBo.setCatalogueIds(catalogIds);
if(catalogIds.isEmpty()){
return new ArrayList<>();
}
List<DesVolumeFile> list = volumeFileService.list(Wrappers.<DesVolumeFile>lambdaQuery().in(DesVolumeFile::getVolumeCatalogId, catalogIds));
return BeanUtil.copyToList(list, DesCollectFileVo.class);
ArrayList<DesCollectFileVo> desCollectFileVos = new ArrayList<>();
for (DesVolumeFile desVolumeFile : list){
DesCollectFileVo desCollectFileVo = BeanUtil.copyProperties(desVolumeFile, DesCollectFileVo.class);
desCollectFileVo.setFileUrl(ossService.getById(desVolumeFile.getFileId()).getUrl());
desCollectFileVos.add(desCollectFileVo);
}
return desCollectFileVos;
}
/**

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java
View File

@ -275,6 +275,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
String volumeNumber = req.getVolumeNumber();
String documentName = req.getDocumentName();
String auditStatus = req.getAuditStatus();
lqw.orderByDesc(DesVolumeCatalog::getCreateTime);
lqw.like(StringUtils.isNotBlank(documentName), DesVolumeCatalog::getDocumentName, documentName);
lqw.eq(StringUtils.isNotBlank(volumeNumber), DesVolumeCatalog::getVolumeNumber, volumeNumber);
lqw.eq(ObjectUtils.isNotEmpty(projectId), DesVolumeCatalog::getProjectId, projectId);

46
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java
View File

@ -29,6 +29,7 @@ import org.dromara.design.domain.vo.volumefile.DesVolumeFileCodeVo;
import org.dromara.design.domain.vo.volumefile.DesVolumeFileJoinVo;
import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo;
import org.dromara.design.mapper.DesVolumeFileMapper;
import org.dromara.design.service.IDesDrawingService;
import org.dromara.design.service.IDesVolumeCatalogService;
import org.dromara.design.service.IDesVolumeFileService;
import org.dromara.design.service.IDesVolumeFileViewerService;
@ -37,6 +38,7 @@ import org.dromara.project.service.IBusProjectService;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -62,13 +64,12 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
@Resource
private IDesVolumeCatalogService volumeCatalogService;
@Resource
private IDesVolumeFileViewerService volumeFileViewerService;
@Resource
private IBusProjectService projectService;
@Lazy
@Resource
private IDesDrawingService self;
/**
* 分页查询卷册文件列表
*
@ -114,10 +115,12 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
public DesVolumeFileCodeVo getCodeInfo(Long id) {
DesVolumeFile desVolumeFile = getById(id);
DesVolumeCatalog desVolumeCatalog = volumeCatalogService.getById(desVolumeFile.getVolumeCatalogId());
DesVolumeFileCodeVo desVolumeFileCodeVo = BeanUtil.copyProperties(desVolumeCatalog, DesVolumeFileCodeVo.class);
BusProject byId = projectService.getById(desVolumeCatalog.getProjectId());
desVolumeFileCodeVo.setProjectName(byId.getProjectName());
desVolumeFileCodeVo.setType(desVolumeFile.getType());
//查询过程图纸最新版
List<DesVolumeFile> existingFiles = baseMapper.selectList(new LambdaQueryWrapper<DesVolumeFile>()
@ -127,13 +130,20 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
DesVolumeFile first = existingFiles.getFirst();
if("4".equals(desVolumeFile.getStatus())){
if("4".equals(desVolumeFile.getType())){
SysOssVo ossVo = ossService.getById(first.getFileId());
desVolumeFileCodeVo.setFileUrl(ossVo.getUrl());
}
if("1".equals(desVolumeFile.getStatus()) && !first.getId().equals(id)){
SysOssVo ossVo = ossService.getById(first.getFileId());
desVolumeFileCodeVo.setFileUrl(ossVo.getUrl());
if("1".equals(desVolumeFile.getType()) ){
if(!first.getId().equals(id)){
desVolumeFileCodeVo.setIsLatest(false);
SysOssVo ossVo = ossService.getById(first.getFileId());
desVolumeFileCodeVo.setFileUrl(ossVo.getUrl());
}else{
desVolumeFileCodeVo.setIsLatest(true);
}
}
return desVolumeFileCodeVo;
@ -361,14 +371,21 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
}
desVolumeFile.setAuditStatus(processEvent.getStatus());
//如果完成，以前的图纸类型变为作废图纸，状态改为作废 暂定
// if (processEvent.getStatus().equals("finish")){
if (processEvent.getStatus().equals("finish")){
// this.lambdaUpdate().set(DesVolumeFile::getStatus, "2")
// .set(DesVolumeFile::getType, "4")
// .eq(DesVolumeFile::getVolumeCatalogId, desVolumeFile.getVolumeCatalogId())
// .eq(DesVolumeFile::getType, "1")
// .ne(DesVolumeFile::getId, desVolumeFile.getId())
// .update();
// }
//异步处理二维码
self.addQRCodeToPDF(desVolumeFile.getId(),false)
.thenAccept(result -> log.info("图纸[{}-{} ]添加二维码成功", desVolumeFile.getFileName(), desVolumeFile.getId()))
.exceptionally(ex -> {
log.error("图纸[{}-{}]添加二维码失败", desVolumeFile.getFileName(), desVolumeFile.getId(), ex);
return null;
});
}
this.updateById(desVolumeFile);
}
@ -418,6 +435,15 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
return;
}
desVolumeFile.setAuditStatus(processEvent.getStatus());
if (processEvent.getStatus().equals("finish")){
//异步处理二维码
self.addQRCodeToPDF(desVolumeFile.getId(),false)
.thenAccept(result -> log.info("图纸[{}-{} ]添加二维码成功", desVolumeFile.getFileName(), desVolumeFile.getId()))
.exceptionally(ex -> {
log.error("图纸[{}-{}]添加二维码失败", desVolumeFile.getFileName(), desVolumeFile.getId(), ex);
return null;
});
}
this.updateById(desVolumeFile);
}

134
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java Normal file
View File

@ -0,0 +1,134 @@
package org.dromara.tender.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.design.domain.bo.ObtainAllVersionNumbersReq;
import org.dromara.design.domain.bo.SheetListReq;
import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo;
import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 限价一览
*
* @author Lion Li
* @date 2025-08-19
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/tender/billofquantitiesLimitList")
public class BusBillofquantitiesLimitListController extends BaseController {
private final IBusBillofquantitiesLimitListService busBillofquantitiesLimitListService;
/**
* 查询限价一览列表
*/
@SaCheckPermission("tender:billofquantitiesLimitList:list")
@GetMapping("/list")
public R<List<BusBillofquantitiesLimitListVo>> list(BusBillofquantitiesLimitListBo bo, PageQuery pageQuery) {
return R.ok(busBillofquantitiesLimitListService.getTree(bo));
}
/**
* 查询限价一览列表
*/
@SaCheckPermission("tender:billofquantitiesLimitList:getTree")
@GetMapping("/getTree")
public R<List<BusBillofquantitiesLimitListVo>> getTree(BusBillofquantitiesLimitListBo bo) {
return R.ok(busBillofquantitiesLimitListService.getTree(bo));
}
/**
* 获取所有版本号
*/
@SaCheckPermission("design:billofquantitiesLimitList:obtainAllVersionNumbers")
@GetMapping("/obtainAllVersionNumbers")
public R<List<String>> obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo) {
return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo));
}
/**
* 获取指定版本的sheet
*/
@SaCheckPermission("design:billofquantitiesLimitList:sheetList")
@GetMapping("/sheetList")
public R<List<String>> sheetList(BusBillofquantitiesLimitListBo bo) {
return R.ok(busBillofquantitiesLimitListService.sheetList(bo));
}
/**
* 导出限价一览列表
*/
@SaCheckPermission("tender:billofquantitiesLimitList:export")
@Log(title = "限价一览", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(BusBillofquantitiesLimitListBo bo, HttpServletResponse response) {
List<BusBillofquantitiesLimitListVo> list = busBillofquantitiesLimitListService.queryList(bo);
ExcelUtil.exportExcel(list, "限价一览", BusBillofquantitiesLimitListVo.class, response);
}
/**
* 获取限价一览详细信息
*
* @param id 主键
*/
@SaCheckPermission("tender:billofquantitiesLimitList:query")
@GetMapping("/{id}")
public R<BusBillofquantitiesLimitListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(busBillofquantitiesLimitListService.queryById(id));
}
/**
* 新增限价一览
*/
@SaCheckPermission("tender:billofquantitiesLimitList:add")
@Log(title = "限价一览", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BusBillofquantitiesLimitListBo bo) {
return toAjax(busBillofquantitiesLimitListService.insertByBo(bo));
}
/**
* 修改限价一览
*/
@SaCheckPermission("tender:billofquantitiesLimitList:edit")
@Log(title = "限价一览", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusBillofquantitiesLimitListBo bo) {
return toAjax(busBillofquantitiesLimitListService.updateByBo(bo));
}
/**
* 删除限价一览
*
* @param ids 主键串
*/
@SaCheckPermission("tender:billofquantitiesLimitList:remove")
@Log(title = "限价一览", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(busBillofquantitiesLimitListService.deleteWithValidByIds(List.of(ids), true));
}
}

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusIndicatorPlanningLimitListController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.tender.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.tender.domain.vo.BusIndicatorPlanningLimitListVo;
import org.dromara.tender.domain.bo.BusIndicatorPlanningLimitListBo;
import org.dromara.tender.service.IBusIndicatorPlanningLimitListService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 分标策划-限价一览
*
* @author Lion Li
* @date 2025-08-19
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/tender/indicatorPlanningLimitList")
public class BusIndicatorPlanningLimitListController extends BaseController {
private final IBusIndicatorPlanningLimitListService busIndicatorPlanningLimitListService;
/**
* 查询分标策划-限价一览列表
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:list")
@GetMapping("/list")
public TableDataInfo<BusIndicatorPlanningLimitListVo> list(BusIndicatorPlanningLimitListBo bo, PageQuery pageQuery) {
return busIndicatorPlanningLimitListService.queryPageList(bo, pageQuery);
}
/**
* 导出分标策划-限价一览列表
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:export")
@Log(title = "分标策划-限价一览", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(BusIndicatorPlanningLimitListBo bo, HttpServletResponse response) {
List<BusIndicatorPlanningLimitListVo> list = busIndicatorPlanningLimitListService.queryList(bo);
ExcelUtil.exportExcel(list, "分标策划-限价一览", BusIndicatorPlanningLimitListVo.class, response);
}
/**
* 获取分标策划-限价一览详细信息
*
* @param id 主键
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:query")
@GetMapping("/{id}")
public R<BusIndicatorPlanningLimitListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(busIndicatorPlanningLimitListService.queryById(id));
}
/**
* 新增分标策划-限价一览
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:add")
@Log(title = "分标策划-限价一览", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BusIndicatorPlanningLimitListBo bo) {
return toAjax(busIndicatorPlanningLimitListService.insertByBo(bo));
}
/**
* 修改分标策划-限价一览
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:edit")
@Log(title = "分标策划-限价一览", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusIndicatorPlanningLimitListBo bo) {
return toAjax(busIndicatorPlanningLimitListService.updateByBo(bo));
}
/**
* 删除分标策划-限价一览
*
* @param ids 主键串
*/
@SaCheckPermission("tender:indicatorPlanningLimitList:remove")
@Log(title = "分标策划-限价一览", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(busIndicatorPlanningLimitListService.deleteWithValidByIds(List.of(ids), true));
}
}

112
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java Normal file
View File

@ -0,0 +1,112 @@
package org.dromara.tender.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.core.exception.ServiceException;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.tender.domain.vo.BusSegmentedIndicatorPlanningVo;
import org.dromara.tender.domain.bo.BusSegmentedIndicatorPlanningBo;
import org.dromara.tender.service.IBusSegmentedIndicatorPlanningService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 分标策划
*
* @author Lion Li
* @date 2025-08-19
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/tender/segmentedIndicatorPlanning")
public class BusSegmentedIndicatorPlanningController extends BaseController {
private final IBusSegmentedIndicatorPlanningService busSegmentedIndicatorPlanningService;
/**
* 查询分标策划列表
*/
@SaCheckPermission("tender:segmentedIndicatorPlanning:list")
@GetMapping("/list")
public TableDataInfo<BusSegmentedIndicatorPlanningVo> list(BusSegmentedIndicatorPlanningBo bo, PageQuery pageQuery) {
if (bo.getProjectId() == null) {
throw new ServiceException("项目id不能为空");
}
if (bo.getDictId() == null) {
throw new ServiceException("分包类型id不能为空");
}
return busSegmentedIndicatorPlanningService.queryPageList(bo, pageQuery);
}
/**
* 导出分标策划列表
*/
// @SaCheckPermission("tender:segmentedIndicatorPlanning:export")
// @Log(title = "分标策划", businessType = BusinessType.EXPORT)
// @PostMapping("/export")
// public void export(BusSegmentedIndicatorPlanningBo bo, HttpServletResponse response) {
// List<BusSegmentedIndicatorPlanningVo> list = busSegmentedIndicatorPlanningService.queryList(bo);
// ExcelUtil.exportExcel(list, "分标策划", BusSegmentedIndicatorPlanningVo.class, response);
// }
/**
* 获取分标策划详细信息
*
* @param id 主键
*/
@SaCheckPermission("tender:segmentedIndicatorPlanning:query")
@GetMapping("/{id}")
public R<BusSegmentedIndicatorPlanningVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(busSegmentedIndicatorPlanningService.queryById(id));
}
/**
* 新增分标策划
*/
@SaCheckPermission("tender:segmentedIndicatorPlanning:add")
@Log(title = "分标策划", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BusSegmentedIndicatorPlanningBo bo) {
return toAjax(busSegmentedIndicatorPlanningService.insertByBo(bo));
}
/**
* 修改分标策划
*/
@SaCheckPermission("tender:segmentedIndicatorPlanning:edit")
@Log(title = "分标策划", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusSegmentedIndicatorPlanningBo bo) {
return toAjax(busSegmentedIndicatorPlanningService.updateByBo(bo));
}
/**
* 删除分标策划
*
* @param ids 主键串
*/
@SaCheckPermission("tender:segmentedIndicatorPlanning:remove")
@Log(title = "分标策划", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(busSegmentedIndicatorPlanningService.deleteWithValidByIds(List.of(ids), true));
}
}

97
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBillofquantitiesLimitList.java Normal file
View File

@ -0,0 +1,97 @@
package org.dromara.tender.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 限价一览对象 bus_billofquantities_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("bus_billofquantities_limit_list")
public class BusBillofquantitiesLimitList extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目Id
*/
private Long projectId;
/**
* 版本号
*/
private String versions;
/**
* 表名
*/
private String sheet;
/**
* 子ID
*/
private String sid;
/**
* 父ID
*/
private String pid;
/**
* 编号
*/
private String num;
/**
* 名称
*/
private String name;
/**
* 规格
*/
private String specification;
/**
* 单位
*/
private String unit;
/**
* 数量
*/
private BigDecimal quantity;
/**
* 单价
*/
private BigDecimal unitPrice;
/**
* 总价
*/
// private BigDecimal price;
/**
* 备注
*/
private String remark;
}

47
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusIndicatorPlanningLimitList.java Normal file
View File

@ -0,0 +1,47 @@
package org.dromara.tender.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 分标策划-限价一览对象 bus_indicator_planning_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("bus_indicator_planning_limit_list")
public class BusIndicatorPlanningLimitList extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 分标策划Id
*/
private Long segmentedIndicatorId;
/**
* 限价一览id
*/
private Long limitListId;
/**
* 数量
*/
private BigDecimal num;
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.tender.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 分标策划对象 bus_segmented_indicator_planning
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("bus_segmented_indicator_planning")
public class BusSegmentedIndicatorPlanning extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目Id
*/
private Long projectId;
/**
* 分包类型id
*/
private Long dictId;
/**
* 分包类型名称
*/
private String dictName;
/**
* 名称
*/
private String name;
/**
* 计划招标时间
*/
private LocalDate plannedBiddingTime;
/**
* 总价
*/
private Long price;
/**
* 分包内容
*/
private String content;
}

99
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBillofquantitiesLimitListBo.java Normal file
View File

@ -0,0 +1,99 @@
package org.dromara.tender.domain.bo;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 限价一览业务对象 bus_billofquantities_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BusBillofquantitiesLimitList.class, reverseConvertGenerate = false)
public class BusBillofquantitiesLimitListBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目Id
*/
@NotNull(message = "项目Id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 版本号
*/
@NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class })
private String versions;
/**
* 表名
*/
private String sheet;
/**
* 子ID
*/
private String sid;
/**
* 父ID
*/
private String pid;
/**
* 编号
*/
private String num;
/**
* 名称
*/
private String name;
/**
* 规格
*/
private String specification;
/**
* 单位
*/
private String unit;
/**
* 数量
*/
private BigDecimal quantity;
/**
* 单价
*/
private BigDecimal unitPrice;
/**
* 总价
*/
// private BigDecimal price;
/**
* 备注
*/
private String remark;
}

47
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusIndicatorPlanningLimitListBo.java Normal file
View File

@ -0,0 +1,47 @@
package org.dromara.tender.domain.bo;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 分标策划-限价一览业务对象 bus_indicator_planning_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BusIndicatorPlanningLimitList.class, reverseConvertGenerate = false)
public class BusIndicatorPlanningLimitListBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 分标策划Id
*/
private Long segmentedIndicatorId;
/**
* 限价一览id
*/
private Long limitListId;
/**
* 数量
*/
private BigDecimal num;
}

80
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java Normal file
View File

@ -0,0 +1,80 @@
package org.dromara.tender.domain.bo;
import org.dromara.tender.domain.BusSegmentedIndicatorPlanning;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 分标策划业务对象 bus_segmented_indicator_planning
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BusSegmentedIndicatorPlanning.class, reverseConvertGenerate = false)
public class BusSegmentedIndicatorPlanningBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目Id
*/
@NotNull(message = "项目Id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 分包类型id
*/
@NotNull(message = "分包类型id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dictId;
/**
* 分包类型名称
*/
private String dictName;
/**
* 名称
*/
private String name;
/**
* 计划招标时间
*/
private LocalDate plannedBiddingTime;
/**
* 总价
*/
private BigDecimal price;
/**
* 分包内容
*/
private String content;
/**
* 限价一览表ids
*/
private List<BusIndicatorPlanningLimitListBo> limitListBos;
}

123
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBillofquantitiesLimitListVo.java Normal file
View File

@ -0,0 +1,123 @@
package org.dromara.tender.domain.vo;
import org.dromara.design.domain.vo.ObtainTheListRes;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 限价一览视图对象 bus_billofquantities_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = BusBillofquantitiesLimitList.class)
public class BusBillofquantitiesLimitListVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目Id
*/
@ExcelProperty(value = "项目Id")
private Long projectId;
/**
* 版本号
*/
@ExcelProperty(value = "版本号")
private String versions;
/**
* 表名
*/
@ExcelProperty(value = "表名")
private String sheet;
/**
* 子ID
*/
@ExcelProperty(value = "子ID")
private String sid;
/**
* 父ID
*/
@ExcelProperty(value = "父ID")
private String pid;
/**
* 编号
*/
@ExcelProperty(value = "编号")
private String num;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String name;
/**
* 规格
*/
@ExcelProperty(value = "规格")
private String specification;
/**
* 单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 数量
*/
@ExcelProperty(value = "数量")
private BigDecimal quantity;
/**
* 单价
*/
@ExcelProperty(value = "单价")
private BigDecimal unitPrice;
/**
* 总价
*/
// @ExcelProperty(value = "总价")
private BigDecimal price;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 子节点
*/
private List<BusBillofquantitiesLimitListVo> children = new ArrayList<>();
}

57
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusIndicatorPlanningLimitListVo.java Normal file
View File

@ -0,0 +1,57 @@
package org.dromara.tender.domain.vo;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 分标策划-限价一览视图对象 bus_indicator_planning_limit_list
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = BusIndicatorPlanningLimitList.class)
public class BusIndicatorPlanningLimitListVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 分标策划Id
*/
@ExcelProperty(value = "分标策划Id")
private Long segmentedIndicatorId;
/**
* 限价一览id
*/
@ExcelProperty(value = "限价一览id")
private Long limitListId;
/**
* 数量
*/
@ExcelProperty(value = "数量")
private BigDecimal num;
}

84
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java Normal file
View File

@ -0,0 +1,84 @@
package org.dromara.tender.domain.vo;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.tender.domain.BusSegmentedIndicatorPlanning;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 分标策划视图对象 bus_segmented_indicator_planning
*
* @author Lion Li
* @date 2025-08-19
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = BusSegmentedIndicatorPlanning.class)
public class BusSegmentedIndicatorPlanningVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目Id
*/
@ExcelProperty(value = "项目Id")
private Long projectId;
/**
* 分包类型id
*/
@ExcelProperty(value = "分包类型id")
private Long dictId;
/**
* 分包类型名称
*/
@ExcelProperty(value = "分包类型名称")
private String dictName;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String name;
/**
* 计划招标时间
*/
@ExcelProperty(value = "计划招标时间")
private LocalDate plannedBiddingTime;
/**
* 总价
*/
@ExcelProperty(value = "总价")
private BigDecimal price;
/**
* 分包内容
*/
@ExcelProperty(value = "分包内容")
private String content;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBillofquantitiesLimitListMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.tender.mapper;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 限价一览Mapper接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface BusBillofquantitiesLimitListMapper extends BaseMapperPlus<BusBillofquantitiesLimitList, BusBillofquantitiesLimitListVo> {
}

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusIndicatorPlanningLimitListMapper.java Normal file
View File

@ -0,0 +1,22 @@
package org.dromara.tender.mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.design.domain.bo.ObtainTheListReq;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import org.dromara.tender.domain.vo.BusIndicatorPlanningLimitListVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.math.BigDecimal;
/**
* 分标策划-限价一览Mapper接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface BusIndicatorPlanningLimitListMapper extends BaseMapperPlus<BusIndicatorPlanningLimitList, BusIndicatorPlanningLimitListVo> {
BigDecimal getLimitCoount(@Param("limitListId") Long id);
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusSegmentedIndicatorPlanningMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.tender.mapper;
import org.dromara.tender.domain.BusSegmentedIndicatorPlanning;
import org.dromara.tender.domain.vo.BusSegmentedIndicatorPlanningVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 分标策划Mapper接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface BusSegmentedIndicatorPlanningMapper extends BaseMapperPlus<BusSegmentedIndicatorPlanning, BusSegmentedIndicatorPlanningVo> {
}

87
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java Normal file
View File

@ -0,0 +1,87 @@
package org.dromara.tender.service;
import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo;
import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 限价一览Service接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface IBusBillofquantitiesLimitListService extends IService<BusBillofquantitiesLimitList>{
/**
* 查询限价一览
*
* @param id 主键
* @return 限价一览
*/
BusBillofquantitiesLimitListVo queryById(Long id);
/**
* 分页查询限价一览列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 限价一览分页列表
*/
TableDataInfo<BusBillofquantitiesLimitListVo> queryPageList(BusBillofquantitiesLimitListBo bo, PageQuery pageQuery);
/**
* 查询符合条件的限价一览列表
*
* @param bo 查询条件
* @return 限价一览列表
*/
List<BusBillofquantitiesLimitListVo> queryList(BusBillofquantitiesLimitListBo bo);
/**
* 新增限价一览
*
* @param bo 限价一览
* @return 是否新增成功
*/
Boolean insertByBo(BusBillofquantitiesLimitListBo bo);
/**
* 修改限价一览
*
* @param bo 限价一览
* @return 是否修改成功
*/
Boolean updateByBo(BusBillofquantitiesLimitListBo bo);
/**
* 校验并批量删除限价一览信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询限价一览表返树形结构数据
* @param bo
* @return
*/
List<BusBillofquantitiesLimitListVo> getTree(BusBillofquantitiesLimitListBo bo);
/**
* 获取所有版本号
*/
List<String> obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo);
/**
* 获取指定版本的sheet
*/
List<String> sheetList(BusBillofquantitiesLimitListBo bo);
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusIndicatorPlanningLimitListService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.tender.service;
import org.dromara.tender.domain.vo.BusIndicatorPlanningLimitListVo;
import org.dromara.tender.domain.bo.BusIndicatorPlanningLimitListBo;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 分标策划-限价一览Service接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface IBusIndicatorPlanningLimitListService extends IService<BusIndicatorPlanningLimitList>{
/**
* 查询分标策划-限价一览
*
* @param id 主键
* @return 分标策划-限价一览
*/
BusIndicatorPlanningLimitListVo queryById(Long id);
/**
* 分页查询分标策划-限价一览列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 分标策划-限价一览分页列表
*/
TableDataInfo<BusIndicatorPlanningLimitListVo> queryPageList(BusIndicatorPlanningLimitListBo bo, PageQuery pageQuery);
/**
* 查询符合条件的分标策划-限价一览列表
*
* @param bo 查询条件
* @return 分标策划-限价一览列表
*/
List<BusIndicatorPlanningLimitListVo> queryList(BusIndicatorPlanningLimitListBo bo);
/**
* 新增分标策划-限价一览
*
* @param bo 分标策划-限价一览
* @return 是否新增成功
*/
Boolean insertByBo(BusIndicatorPlanningLimitListBo bo);
/**
* 修改分标策划-限价一览
*
* @param bo 分标策划-限价一览
* @return 是否修改成功
*/
Boolean updateByBo(BusIndicatorPlanningLimitListBo bo);
/**
* 校验并批量删除分标策划-限价一览信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusSegmentedIndicatorPlanningService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.tender.service;
import org.dromara.tender.domain.vo.BusSegmentedIndicatorPlanningVo;
import org.dromara.tender.domain.bo.BusSegmentedIndicatorPlanningBo;
import org.dromara.tender.domain.BusSegmentedIndicatorPlanning;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 分标策划Service接口
*
* @author Lion Li
* @date 2025-08-19
*/
public interface IBusSegmentedIndicatorPlanningService extends IService<BusSegmentedIndicatorPlanning>{
/**
* 查询分标策划
*
* @param id 主键
* @return 分标策划
*/
BusSegmentedIndicatorPlanningVo queryById(Long id);
/**
* 分页查询分标策划列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 分标策划分页列表
*/
TableDataInfo<BusSegmentedIndicatorPlanningVo> queryPageList(BusSegmentedIndicatorPlanningBo bo, PageQuery pageQuery);
/**
* 查询符合条件的分标策划列表
*
* @param bo 查询条件
* @return 分标策划列表
*/
List<BusSegmentedIndicatorPlanningVo> queryList(BusSegmentedIndicatorPlanningBo bo);
/**
* 新增分标策划
*
* @param bo 分标策划
* @return 是否新增成功
*/
Boolean insertByBo(BusSegmentedIndicatorPlanningBo bo);
/**
* 修改分标策划
*
* @param bo 分标策划
* @return 是否修改成功
*/
Boolean updateByBo(BusSegmentedIndicatorPlanningBo bo);
/**
* 校验并批量删除分标策划信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

216
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java Normal file
View File

@ -0,0 +1,216 @@
package org.dromara.tender.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.design.domain.BusBillofquantities;
import org.springframework.stereotype.Service;
import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo;
import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import org.dromara.tender.mapper.BusBillofquantitiesLimitListMapper;
import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
/**
* 限价一览Service业务层处理
*
* @author Lion Li
* @date 2025-08-19
*/
@RequiredArgsConstructor
@Service
public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl<BusBillofquantitiesLimitListMapper, BusBillofquantitiesLimitList> implements IBusBillofquantitiesLimitListService {
private final BusBillofquantitiesLimitListMapper baseMapper;
/**
* 查询限价一览
*
* @param id 主键
* @return 限价一览
*/
@Override
public BusBillofquantitiesLimitListVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询限价一览列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 限价一览分页列表
*/
@Override
public TableDataInfo<BusBillofquantitiesLimitListVo> queryPageList(BusBillofquantitiesLimitListBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<BusBillofquantitiesLimitList> lqw = buildQueryWrapper(bo);
Page<BusBillofquantitiesLimitListVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的限价一览列表
*
* @param bo 查询条件
* @return 限价一览列表
*/
@Override
public List<BusBillofquantitiesLimitListVo> queryList(BusBillofquantitiesLimitListBo bo) {
LambdaQueryWrapper<BusBillofquantitiesLimitList> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<BusBillofquantitiesLimitList> buildQueryWrapper(BusBillofquantitiesLimitListBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BusBillofquantitiesLimitList> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(BusBillofquantitiesLimitList::getId);
lqw.eq(bo.getProjectId() != null, BusBillofquantitiesLimitList::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getVersions()), BusBillofquantitiesLimitList::getVersions, bo.getVersions());
lqw.eq(StringUtils.isNotBlank(bo.getSheet()), BusBillofquantitiesLimitList::getSheet, bo.getSheet());
lqw.eq(StringUtils.isNotBlank(bo.getSid()), BusBillofquantitiesLimitList::getSid, bo.getSid());
lqw.eq(StringUtils.isNotBlank(bo.getPid()), BusBillofquantitiesLimitList::getPid, bo.getPid());
lqw.eq(StringUtils.isNotBlank(bo.getNum()), BusBillofquantitiesLimitList::getNum, bo.getNum());
lqw.like(StringUtils.isNotBlank(bo.getName()), BusBillofquantitiesLimitList::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), BusBillofquantitiesLimitList::getSpecification, bo.getSpecification());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), BusBillofquantitiesLimitList::getUnit, bo.getUnit());
lqw.eq(bo.getQuantity() != null, BusBillofquantitiesLimitList::getQuantity, bo.getQuantity());
// lqw.eq(bo.getUnitPrice() != null, BusBillofquantitiesLimitList::getUnitPrice, bo.getUnitPrice());
// lqw.eq(bo.getPrice() != null, BusBillofquantitiesLimitList::getPrice, bo.getPrice());
return lqw;
}
/**
* 新增限价一览
*
* @param bo 限价一览
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(BusBillofquantitiesLimitListBo bo) {
BusBillofquantitiesLimitList add = MapstructUtils.convert(bo, BusBillofquantitiesLimitList.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改限价一览
*
* @param bo 限价一览
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(BusBillofquantitiesLimitListBo bo) {
// if (bo.getUnitPrice() != null && bo.getQuantity() != null) {
// bo.setPrice(bo.getUnitPrice().multiply(bo.getQuantity()).setScale(2, RoundingMode.HALF_UP));
// }
BusBillofquantitiesLimitList update = MapstructUtils.convert(bo, BusBillofquantitiesLimitList.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusBillofquantitiesLimitList entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除限价一览信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<BusBillofquantitiesLimitListVo> getTree(BusBillofquantitiesLimitListBo bo) {
//获取所有数据
List<BusBillofquantitiesLimitListVo> listVoList = queryList(bo);
listVoList.stream().filter(vo -> vo.getUnitPrice() !=null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
.forEach(item -> {
item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP));
});
//构建父子映射
Map<String, List<BusBillofquantitiesLimitListVo>> parentMap = listVoList.stream()
.collect(Collectors.groupingBy(BusBillofquantitiesLimitListVo::getPid));
//递归组装树形结构
List<BusBillofquantitiesLimitListVo> treeList = buildTree("0", parentMap);
return treeList;
}
@Override
public List<String> obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo) {
List<BusBillofquantitiesLimitList> busBillofquantitiesLimitLists = baseMapper.selectList(new LambdaQueryWrapper<BusBillofquantitiesLimitList>()
.select(BusBillofquantitiesLimitList::getVersions)
.eq(bo.getProjectId() != null, BusBillofquantitiesLimitList::getProjectId, bo.getProjectId())
.orderByDesc(BusBillofquantitiesLimitList::getCreateTime)
.groupBy(BusBillofquantitiesLimitList::getVersions));
return busBillofquantitiesLimitLists.stream()
.filter(Objects::nonNull)
.map(BusBillofquantitiesLimitList::getVersions)
.collect(Collectors.toList());
}
@Override
public List<String> sheetList(BusBillofquantitiesLimitListBo bo) {
List<BusBillofquantitiesLimitList> busBillofquantitiesLimitLists = baseMapper.selectList(new LambdaQueryWrapper<BusBillofquantitiesLimitList>()
.select(BusBillofquantitiesLimitList::getSheet)
.eq(bo.getProjectId() != null, BusBillofquantitiesLimitList::getProjectId, bo.getProjectId())
.eq(StringUtils.isNotBlank(bo.getVersions()), BusBillofquantitiesLimitList::getVersions, bo.getVersions())
.orderByAsc(BusBillofquantitiesLimitList::getSheet)
.groupBy(BusBillofquantitiesLimitList::getSheet));
return busBillofquantitiesLimitLists.stream()
.filter(Objects::nonNull)
.map(BusBillofquantitiesLimitList::getSheet)
.collect(Collectors.toList());
}
/**
* 递归构建树形结构
* @param parentId 父节点ID（顶级节点为0）
* @param parentMap 父子映射表（key=pid，value=子节点列表）
* @return 组装好的子树列表
*/
private List<BusBillofquantitiesLimitListVo> buildTree(String parentId, Map<String, List<BusBillofquantitiesLimitListVo>> parentMap) {
// 获取当前父节点的所有直接子节点
List<BusBillofquantitiesLimitListVo> children = parentMap.getOrDefault(parentId, Collections.emptyList());
if (children.isEmpty()) {
return Collections.emptyList();
}
// 为每个子节点递归设置其下一级子节点
for (BusBillofquantitiesLimitListVo child : children) {
// 递归查询当前子节点的子节点，设置为它的子树
List<BusBillofquantitiesLimitListVo> subChildren = buildTree(child.getSid(), parentMap);
// 注意：需要在Vo中添加子节点列表字段，用于存储子树
child.setChildren(subChildren);
}
return children;
}
}

132
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusIndicatorPlanningLimitListServiceImpl.java Normal file
View File

@ -0,0 +1,132 @@
package org.dromara.tender.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.tender.domain.bo.BusIndicatorPlanningLimitListBo;
import org.dromara.tender.domain.vo.BusIndicatorPlanningLimitListVo;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import org.dromara.tender.mapper.BusIndicatorPlanningLimitListMapper;
import org.dromara.tender.service.IBusIndicatorPlanningLimitListService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 分标策划-限价一览Service业务层处理
*
* @author Lion Li
* @date 2025-08-19
*/
@RequiredArgsConstructor
@Service
public class BusIndicatorPlanningLimitListServiceImpl extends ServiceImpl<BusIndicatorPlanningLimitListMapper, BusIndicatorPlanningLimitList> implements IBusIndicatorPlanningLimitListService {
private final BusIndicatorPlanningLimitListMapper baseMapper;
/**
* 查询分标策划-限价一览
*
* @param id 主键
* @return 分标策划-限价一览
*/
@Override
public BusIndicatorPlanningLimitListVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询分标策划-限价一览列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 分标策划-限价一览分页列表
*/
@Override
public TableDataInfo<BusIndicatorPlanningLimitListVo> queryPageList(BusIndicatorPlanningLimitListBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<BusIndicatorPlanningLimitList> lqw = buildQueryWrapper(bo);
Page<BusIndicatorPlanningLimitListVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的分标策划-限价一览列表
*
* @param bo 查询条件
* @return 分标策划-限价一览列表
*/
@Override
public List<BusIndicatorPlanningLimitListVo> queryList(BusIndicatorPlanningLimitListBo bo) {
LambdaQueryWrapper<BusIndicatorPlanningLimitList> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<BusIndicatorPlanningLimitList> buildQueryWrapper(BusIndicatorPlanningLimitListBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BusIndicatorPlanningLimitList> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(BusIndicatorPlanningLimitList::getId);
lqw.eq(bo.getSegmentedIndicatorId() != null, BusIndicatorPlanningLimitList::getSegmentedIndicatorId, bo.getSegmentedIndicatorId());
lqw.eq(bo.getLimitListId() != null, BusIndicatorPlanningLimitList::getLimitListId, bo.getLimitListId());
return lqw;
}
/**
* 新增分标策划-限价一览
*
* @param bo 分标策划-限价一览
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(BusIndicatorPlanningLimitListBo bo) {
BusIndicatorPlanningLimitList add = MapstructUtils.convert(bo, BusIndicatorPlanningLimitList.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改分标策划-限价一览
*
* @param bo 分标策划-限价一览
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(BusIndicatorPlanningLimitListBo bo) {
BusIndicatorPlanningLimitList update = MapstructUtils.convert(bo, BusIndicatorPlanningLimitList.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusIndicatorPlanningLimitList entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除分标策划-限价一览信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

171
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java Normal file
View File

@ -0,0 +1,171 @@
package org.dromara.tender.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.translation.annotation.Translation;
import org.dromara.tender.domain.BusIndicatorPlanningLimitList;
import org.dromara.tender.domain.bo.BusIndicatorPlanningLimitListBo;
import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
import org.dromara.tender.mapper.BusIndicatorPlanningLimitListMapper;
import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
import org.dromara.tender.service.IBusIndicatorPlanningLimitListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.tender.domain.bo.BusSegmentedIndicatorPlanningBo;
import org.dromara.tender.domain.vo.BusSegmentedIndicatorPlanningVo;
import org.dromara.tender.domain.BusSegmentedIndicatorPlanning;
import org.dromara.tender.mapper.BusSegmentedIndicatorPlanningMapper;
import org.dromara.tender.service.IBusSegmentedIndicatorPlanningService;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 分标策划Service业务层处理
*
* @author Lion Li
* @date 2025-08-19
*/
@RequiredArgsConstructor
@Service
public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl<BusSegmentedIndicatorPlanningMapper, BusSegmentedIndicatorPlanning> implements IBusSegmentedIndicatorPlanningService {
private final BusSegmentedIndicatorPlanningMapper baseMapper;
@Autowired
private BusIndicatorPlanningLimitListMapper indicatorPlanningLimitListMapper;
@Autowired
private IBusBillofquantitiesLimitListService busBillofquantitiesLimitListService;
/**
* 查询分标策划
*
* @param id 主键
* @return 分标策划
*/
@Override
public BusSegmentedIndicatorPlanningVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询分标策划列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 分标策划分页列表
*/
@Override
public TableDataInfo<BusSegmentedIndicatorPlanningVo> queryPageList(BusSegmentedIndicatorPlanningBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<BusSegmentedIndicatorPlanning> lqw = buildQueryWrapper(bo);
Page<BusSegmentedIndicatorPlanningVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的分标策划列表
*
* @param bo 查询条件
* @return 分标策划列表
*/
@Override
public List<BusSegmentedIndicatorPlanningVo> queryList(BusSegmentedIndicatorPlanningBo bo) {
LambdaQueryWrapper<BusSegmentedIndicatorPlanning> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<BusSegmentedIndicatorPlanning> buildQueryWrapper(BusSegmentedIndicatorPlanningBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BusSegmentedIndicatorPlanning> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(BusSegmentedIndicatorPlanning::getPlannedBiddingTime);
lqw.eq(bo.getProjectId() != null, BusSegmentedIndicatorPlanning::getProjectId, bo.getProjectId());
lqw.eq(bo.getDictId() != null, BusSegmentedIndicatorPlanning::getDictId, bo.getDictId());
lqw.like(StringUtils.isNotBlank(bo.getName()), BusSegmentedIndicatorPlanning::getName, bo.getName());
lqw.like(StringUtils.isNotBlank(bo.getContent()), BusSegmentedIndicatorPlanning::getContent, bo.getContent());
lqw.eq(bo.getPlannedBiddingTime() != null, BusSegmentedIndicatorPlanning::getPlannedBiddingTime, bo.getPlannedBiddingTime());
lqw.eq(bo.getPrice() != null, BusSegmentedIndicatorPlanning::getPrice, bo.getPrice());
return lqw;
}
/**
* 新增分标策划
*
* @param bo 分标策划
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(BusSegmentedIndicatorPlanningBo bo) {
BusSegmentedIndicatorPlanning add = MapstructUtils.convert(bo, BusSegmentedIndicatorPlanning.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
if (bo.getLimitListBos() != null && !bo.getLimitListBos().isEmpty()) {
List<BusIndicatorPlanningLimitList> planningLimitListList = new ArrayList<>();
for (BusIndicatorPlanningLimitListBo limitListBo : bo.getLimitListBos()) {
BusIndicatorPlanningLimitList busIndicatorPlanningLimitList = new BusIndicatorPlanningLimitList();
busIndicatorPlanningLimitList.setLimitListId(limitListBo.getLimitListId());
busIndicatorPlanningLimitList.setSegmentedIndicatorId(bo.getId());
BigDecimal count = indicatorPlanningLimitListMapper.getLimitCoount(limitListBo.getLimitListId());
BusBillofquantitiesLimitListVo busBillofquantitiesLimitListVo = busBillofquantitiesLimitListService.queryById(limitListBo.getLimitListId());
if (busBillofquantitiesLimitListVo == null) {
throw new ServiceException("限价一览数据不存在");
}
if (busBillofquantitiesLimitListVo.getQuantity().compareTo(limitListBo.getNum().add(count)) < 0) {
throw new ServiceException(busBillofquantitiesLimitListVo.getName()+"数量超过了总数量");
}
planningLimitListList.add(busIndicatorPlanningLimitList);
}
indicatorPlanningLimitListMapper.insertBatch(planningLimitListList);
}
}
return flag;
}
/**
* 修改分标策划
*
* @param bo 分标策划
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(BusSegmentedIndicatorPlanningBo bo) {
BusSegmentedIndicatorPlanning update = MapstructUtils.convert(bo, BusSegmentedIndicatorPlanning.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusSegmentedIndicatorPlanning entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除分标策划信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrExpensesContractMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.ctr.mapper.CtrExpensesContractMapper">
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrFileMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.ctr.mapper.CtrFileMapper">
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrIncomeContractMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.ctr.mapper.CtrIncomeContractMapper">
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.tender.mapper.BusBillofquantitiesLimitListMapper">
</mapper>

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusIndicatorPlanningLimitListMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.tender.mapper.BusIndicatorPlanningLimitListMapper">
<select id="getLimitCoount" resultType="java.math.BigDecimal">
SELECT SUM("num") as num
from bus_indicator_planning_limit_list
where id = #{limitListId}
</select>
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusSegmentedIndicatorPlanningMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.tender.mapper.BusSegmentedIndicatorPlanningMapper">
</mapper>