diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java new file mode 100644 index 00000000..0fe53f58 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java @@ -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 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 list = ctrExpensesContractService.queryList(bo); + ExcelUtil.exportExcel(list, "支出合同", CtrExpensesContractVo.class, response); + } + + /** + * 获取支出合同详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("ctr:expensesContract:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(ctrExpensesContractService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrFileController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrFileController.java new file mode 100644 index 00000000..2d2acd2a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrFileController.java @@ -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 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 list = ctrFileService.queryList(bo); + ExcelUtil.exportExcel(list, "合同附件", CtrFileVo.class, response); + } + + /** + * 获取合同附件详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("ctr:file:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(ctrFileService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrIncomeContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrIncomeContractController.java new file mode 100644 index 00000000..ec67fbbe --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrIncomeContractController.java @@ -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 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 list = ctrIncomeContractService.queryList(bo); + ExcelUtil.exportExcel(list, "收入合同", CtrIncomeContractVo.class, response); + } + + /** + * 获取收入合同详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("ctr:incomeContract:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(ctrIncomeContractService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java new file mode 100644 index 00000000..ef69e433 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrFile.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrFile.java new file mode 100644 index 00000000..8303d4a7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrFile.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java new file mode 100644 index 00000000..fed7b2bc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java new file mode 100644 index 00000000..de4146c3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java @@ -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 fileList; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrFileBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrFileBo.java new file mode 100644 index 00000000..75a562a6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrFileBo.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java new file mode 100644 index 00000000..8e18b390 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java @@ -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 fileList; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java new file mode 100644 index 00000000..413cc9c0 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrFileVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrFileVo.java new file mode 100644 index 00000000..00b736b2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrFileVo.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java new file mode 100644 index 00000000..394a22a2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java @@ -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; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrExpensesContractMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrExpensesContractMapper.java new file mode 100644 index 00000000..20fe7fa6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrExpensesContractMapper.java @@ -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 { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrFileMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrFileMapper.java new file mode 100644 index 00000000..4d6be3c1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrFileMapper.java @@ -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 { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrIncomeContractMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrIncomeContractMapper.java new file mode 100644 index 00000000..6088a9b8 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/mapper/CtrIncomeContractMapper.java @@ -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 { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrExpensesContractService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrExpensesContractService.java new file mode 100644 index 00000000..054c73dd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrExpensesContractService.java @@ -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{ + + /** + * 查询支出合同 + * + * @param id 主键 + * @return 支出合同 + */ + CtrExpensesContractVo queryById(Long id); + + /** + * 分页查询支出合同列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 支出合同分页列表 + */ + TableDataInfo queryPageList(CtrExpensesContractBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的支出合同列表 + * + * @param bo 查询条件 + * @return 支出合同列表 + */ + List 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 ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrFileService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrFileService.java new file mode 100644 index 00000000..f7e26cc9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrFileService.java @@ -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{ + + /** + * 查询合同附件 + * + * @param id 主键 + * @return 合同附件 + */ + CtrFileVo queryById(Long id); + + /** + * 分页查询合同附件列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同附件分页列表 + */ + TableDataInfo queryPageList(CtrFileBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的合同附件列表 + * + * @param bo 查询条件 + * @return 合同附件列表 + */ + List 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 ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrIncomeContractService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrIncomeContractService.java new file mode 100644 index 00000000..244eac2f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/ICtrIncomeContractService.java @@ -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{ + + /** + * 查询收入合同 + * + * @param id 主键 + * @return 收入合同 + */ + CtrIncomeContractVo queryById(Long id); + + /** + * 分页查询收入合同列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 收入合同分页列表 + */ + TableDataInfo queryPageList(CtrIncomeContractBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的收入合同列表 + * + * @param bo 查询条件 + * @return 收入合同列表 + */ + List 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 ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java new file mode 100644 index 00000000..2aa9c55e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java @@ -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 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 queryPageList(CtrExpensesContractBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的支出合同列表 + * + * @param bo 查询条件 + * @return 支出合同列表 + */ + @Override + public List queryList(CtrExpensesContractBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(CtrExpensesContractBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrFileServiceImpl.java new file mode 100644 index 00000000..5d829664 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrFileServiceImpl.java @@ -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 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 queryPageList(CtrFileBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的合同附件列表 + * + * @param bo 查询条件 + * @return 合同附件列表 + */ + @Override + public List queryList(CtrFileBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(CtrFileBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrIncomeContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrIncomeContractServiceImpl.java new file mode 100644 index 00000000..5dd7e85d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrIncomeContractServiceImpl.java @@ -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 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 queryPageList(CtrIncomeContractBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的收入合同列表 + * + * @param bo 查询条件 + * @return 收入合同列表 + */ + @Override + public List queryList(CtrIncomeContractBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(CtrIncomeContractBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DesCollectFileVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DesCollectFileVo.java index 83668a90..c1013eb1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DesCollectFileVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DesCollectFileVo.java @@ -71,5 +71,13 @@ public class DesCollectFileVo implements Serializable { @ExcelProperty(value = "审核状态") private String status; + /** + * 图纸类型(1-过程,3-蓝图,4-作废) + */ + private String type; + /** + * 版本号 + */ + private String version; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesExtractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesExtractServiceImpl.java index 6208463b..34f5dd6e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesExtractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesExtractServiceImpl.java @@ -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 fileList(Long id) { List catalogIds = extractCatalogueService.list(Wrappers.lambdaQuery() .eq(DesExtractCatalogue::getExtractId, id)).stream().map(DesExtractCatalogue::getVolumeCatalogId).toList(); - DesCollectFileBo desCollectFileBo = new DesCollectFileBo(); - desCollectFileBo.setCatalogueIds(catalogIds); + if(catalogIds.isEmpty()){ + return new ArrayList<>(); + } List list = volumeFileService.list(Wrappers.lambdaQuery().in(DesVolumeFile::getVolumeCatalogId, catalogIds)); - return BeanUtil.copyToList(list, DesCollectFileVo.class); + ArrayList 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; } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrExpensesContractMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrExpensesContractMapper.xml new file mode 100644 index 00000000..42fd713d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrExpensesContractMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrFileMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrFileMapper.xml new file mode 100644 index 00000000..492d6f2c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrFileMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrIncomeContractMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrIncomeContractMapper.xml new file mode 100644 index 00000000..66e5116e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/ctr/CtrIncomeContractMapper.xml @@ -0,0 +1,7 @@ + + + + +