diff --git a/sql/cms/ContractOuts-sql.sql b/sql/cms/ContractOuts-sql.sql new file mode 100644 index 000000000..6f03200fd --- /dev/null +++ b/sql/cms/ContractOuts-sql.sql @@ -0,0 +1,55 @@ +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '外包合同关联管理', '', 2, 0, 2758, + 'contract-outs', '', 'cms/contractouts/index', 0, 'ContractOuts' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同关联查询', 'cms:contract-outs:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同关联创建', 'cms:contract-outs:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同关联更新', 'cms:contract-outs:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同关联删除', 'cms:contract-outs:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同关联导出', 'cms:contract-outs:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/sql/cms/codegen-OutsContract-sql.sql b/sql/cms/codegen-OutsContract-sql.sql new file mode 100644 index 000000000..9314a5644 --- /dev/null +++ b/sql/cms/codegen-OutsContract-sql.sql @@ -0,0 +1,55 @@ +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '外包合同管理', '', 2, 0, 2759, + 'outs-contract', '', 'cms/outscontract/index', 0, 'OutsContract' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同查询', 'cms:outs-contract:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同创建', 'cms:outs-contract:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同更新', 'cms:outs-contract:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同删除', 'cms:outs-contract:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同导出', 'cms:outs-contract:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/sql/cms/codegen-OutsContractHistory-sql.sql b/sql/cms/codegen-OutsContractHistory-sql.sql new file mode 100644 index 000000000..b4aa98d45 --- /dev/null +++ b/sql/cms/codegen-OutsContractHistory-sql.sql @@ -0,0 +1,55 @@ +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '外包合同历史管理', '', 2, 0, 2758, + 'outs-contract-history', '', 'cms/outscontracthistory/index', 0, 'OutsContractHistory' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同历史查询', 'cms:outs-contract-history:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同历史创建', 'cms:outs-contract-history:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同历史更新', 'cms:outs-contract-history:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同历史删除', 'cms:outs-contract-history:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '外包合同历史导出', 'cms:outs-contract-history:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java index abee178a1..0473bcb3a 100644 --- a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java @@ -9,4 +9,12 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode; */ public interface ErrorCodeConstants { ErrorCode CUSTOMER_COMPANY_NOT_EXISTS = new ErrorCode(1_020_000_000, "客户公司管理不存在"); + + // ========== 外包合同 2_021_000_000 ========== + ErrorCode OUTS_CONTRACT_NOT_EXISTS = new ErrorCode(2_021_000_000, "外包合同不存在"); + + // ========== 外包合同历史 2_022_000_000 ========== + ErrorCode OUTS_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_022_000_000, "外包合同历史不存在"); + // ========== 外包合同关联 2_023_000_000 ========== + ErrorCode CONTRACT_OUTS_NOT_EXISTS = new ErrorCode(2_023_000_000, "外包合同关联不存在"); } diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/ContractOutsController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/ContractOutsController.java new file mode 100644 index 000000000..2cc360103 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/ContractOutsController.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.cms.controller.admin.contractouts; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.contractouts.ContractOutsDO; +import cn.iocoder.yudao.module.cms.service.contractouts.ContractOutsService; + +@Tag(name = "管理后台 - 外包合同关联") +@RestController +@RequestMapping("/cms/contract-outs") +@Validated +public class ContractOutsController { + + @Resource + private ContractOutsService contractOutsService; + + @PostMapping("/create") + @Operation(summary = "创建外包合同关联") + @PreAuthorize("@ss.hasPermission('cms:contract-outs:create')") + public CommonResult createContractOuts(@Valid @RequestBody ContractOutsSaveReqVO createReqVO) { + return success(contractOutsService.createContractOuts(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新外包合同关联") + @PreAuthorize("@ss.hasPermission('cms:contract-outs:update')") + public CommonResult updateContractOuts(@Valid @RequestBody ContractOutsSaveReqVO updateReqVO) { + contractOutsService.updateContractOuts(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除外包合同关联") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('cms:contract-outs:delete')") + public CommonResult deleteContractOuts(@RequestParam("id") Long id) { + contractOutsService.deleteContractOuts(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得外包合同关联") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('cms:contract-outs:query')") + public CommonResult getContractOuts(@RequestParam("id") Long id) { + ContractOutsDO contractOuts = contractOutsService.getContractOuts(id); + return success(BeanUtils.toBean(contractOuts, ContractOutsRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得外包合同关联分页") + @PreAuthorize("@ss.hasPermission('cms:contract-outs:query')") + public CommonResult> getContractOutsPage(@Valid ContractOutsPageReqVO pageReqVO) { + PageResult pageResult = contractOutsService.getContractOutsPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ContractOutsRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出外包合同关联 Excel") + @PreAuthorize("@ss.hasPermission('cms:contract-outs:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportContractOutsExcel(@Valid ContractOutsPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = contractOutsService.getContractOutsPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "外包合同关联.xls", "数据", ContractOutsRespVO.class, + BeanUtils.toBean(list, ContractOutsRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsPageReqVO.java new file mode 100644 index 000000000..fe6bc03c0 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsPageReqVO.java @@ -0,0 +1,44 @@ +package cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 外包合同关联分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ContractOutsPageReqVO extends PageParam { + + @Schema(description = "合同id", example = "16187") + private Long contractId; + + @Schema(description = "外包合同id", example = "9277") + private Long outsContractId; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] cteateTime; + + @Schema(description = "更新人") + private String updator; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] updateTime; + + @Schema(description = "是否删除") + private Boolean delete; + + @Schema(description = "租户id", example = "15943") + private Long tenantId; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsRespVO.java new file mode 100644 index 000000000..475479720 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsRespVO.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 外包合同关联 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ContractOutsRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7688") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "合同id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16187") + @ExcelProperty("合同id") + private Long contractId; + + @Schema(description = "外包合同id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9277") + @ExcelProperty("外包合同id") + private Long outsContractId; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建人") + private String creator; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime cteateTime; + + @Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("更新人") + private String updator; + + @Schema(description = "更新时间") + @ExcelProperty("更新时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否删除") + private Boolean delete; + + @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15943") + @ExcelProperty("租户id") + private Long tenantId; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsSaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsSaveReqVO.java new file mode 100644 index 000000000..540254990 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsSaveReqVO.java @@ -0,0 +1,47 @@ +package cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 外包合同关联新增/修改 Request VO") +@Data +public class ContractOutsSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7688") + private Long id; + + @Schema(description = "合同id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16187") + @NotNull(message = "合同id不能为空") + private Long contractId; + + @Schema(description = "外包合同id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9277") + @NotNull(message = "外包合同id不能为空") + private Long outsContractId; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "创建人不能为空") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime cteateTime; + + @Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "更新人不能为空") + private String updator; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否删除不能为空") + private Boolean delete; + + @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15943") + @NotNull(message = "租户id不能为空") + private Long tenantId; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/OutsContractHistoryController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/OutsContractHistoryController.java new file mode 100644 index 000000000..ba7b70a50 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/OutsContractHistoryController.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO; +import cn.iocoder.yudao.module.cms.service.outscontracthistory.OutsContractHistoryService; + +@Tag(name = "管理后台 - 外包合同历史") +@RestController +@RequestMapping("/cms/outs-contract-history") +@Validated +public class OutsContractHistoryController { + + @Resource + private OutsContractHistoryService outsContractHistoryService; + + @PostMapping("/create") + @Operation(summary = "创建外包合同历史") + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:create')") + public CommonResult createOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO createReqVO) { + return success(outsContractHistoryService.createOutsContractHistory(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新外包合同历史") + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:update')") + public CommonResult updateOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO updateReqVO) { + outsContractHistoryService.updateOutsContractHistory(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除外包合同历史") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:delete')") + public CommonResult deleteOutsContractHistory(@RequestParam("id") Long id) { + outsContractHistoryService.deleteOutsContractHistory(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得外包合同历史") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')") + public CommonResult getOutsContractHistory(@RequestParam("id") Long id) { + OutsContractHistoryDO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id); + return success(BeanUtils.toBean(outsContractHistory, OutsContractHistoryRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得外包合同历史分页") + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')") + public CommonResult> getOutsContractHistoryPage(@Valid OutsContractHistoryPageReqVO pageReqVO) { + PageResult pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, OutsContractHistoryRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出外包合同历史 Excel") + @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportOutsContractHistoryExcel(@Valid OutsContractHistoryPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "外包合同历史.xls", "数据", OutsContractHistoryRespVO.class, + BeanUtils.toBean(list, OutsContractHistoryRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryPageReqVO.java new file mode 100644 index 000000000..723d65fc5 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryPageReqVO.java @@ -0,0 +1,66 @@ +package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 外包合同历史分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OutsContractHistoryPageReqVO extends PageParam { + + @Schema(description = "项目id", example = "31803") + private Long projectId; + + @Schema(description = "合同名称", example = "芋艿") + private String name; + + @Schema(description = "主合同id", example = "19949") + private Long contractId; + + @Schema(description = "类型", example = "1") + private String countType; + + @Schema(description = "合同金额") + private BigDecimal amount; + + @Schema(description = "编号") + private String code; + + @Schema(description = "专业") + private String major; + + @Schema(description = "流程实体id", example = "32397") + private String processInstanceId; + + @Schema(description = "签订时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] signingTime; + + @Schema(description = "结算数") + private BigDecimal settlementAmount; + + @Schema(description = "合同文件url", example = "https://www.iocoder.cn") + private String contractFileUrl; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "流程状态", example = "2") + private String processStatus; + + @Schema(description = "外包合同id", example = "24736") + private Long outsContractId; + + @Schema(description = "版本") + private String version; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryRespVO.java new file mode 100644 index 000000000..9fe006ec2 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryRespVO.java @@ -0,0 +1,84 @@ +package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; + +@Schema(description = "管理后台 - 外包合同历史 Response VO") +@Data +@ExcelIgnoreUnannotated +public class OutsContractHistoryRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803") + @ExcelProperty("项目id") + private Long projectId; + + @Schema(description = "合同名称", example = "芋艿") + @ExcelProperty("合同名称") + private String name; + + @Schema(description = "主合同id", example = "19949") + @ExcelProperty("主合同id") + private Long contractId; + + @Schema(description = "类型", example = "1") + @ExcelProperty(value = "类型", converter = DictConvert.class) + @DictFormat("contract_billing_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private String countType; + + @Schema(description = "合同金额") + @ExcelProperty("合同金额") + private BigDecimal amount; + + @Schema(description = "编号") + @ExcelProperty("编号") + private String code; + + @Schema(description = "专业") + @ExcelProperty(value = "专业", converter = DictConvert.class) + @DictFormat("major") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private String major; + + @Schema(description = "流程实体id", example = "32397") + @ExcelProperty("流程实体id") + private String processInstanceId; + + @Schema(description = "签订时间") + @ExcelProperty("签订时间") + private LocalDateTime signingTime; + + @Schema(description = "结算数") + @ExcelProperty("结算数") + private BigDecimal settlementAmount; + + @Schema(description = "合同文件url", example = "https://www.iocoder.cn") + @ExcelProperty("合同文件url") + private String contractFileUrl; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "流程状态", example = "2") + @ExcelProperty("流程状态") + private String processStatus; + + @Schema(description = "外包合同id", example = "24736") + @ExcelProperty("外包合同id") + private Long outsContractId; + + @Schema(description = "版本") + @ExcelProperty("版本") + private String version; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistorySaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistorySaveReqVO.java new file mode 100644 index 000000000..1007dffcc --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistorySaveReqVO.java @@ -0,0 +1,61 @@ +package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 外包合同历史新增/修改 Request VO") +@Data +public class OutsContractHistorySaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040") + private Long id; + + @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803") + @NotNull(message = "项目id不能为空") + private Long projectId; + + @Schema(description = "合同名称", example = "芋艿") + private String name; + + @Schema(description = "主合同id", example = "19949") + private Long contractId; + + @Schema(description = "类型", example = "1") + private String countType; + + @Schema(description = "合同金额") + private BigDecimal amount; + + @Schema(description = "编号") + private String code; + + @Schema(description = "专业") + private String major; + + @Schema(description = "流程实体id", example = "32397") + private String processInstanceId; + + @Schema(description = "签订时间") + private LocalDateTime signingTime; + + @Schema(description = "结算数") + private BigDecimal settlementAmount; + + @Schema(description = "合同文件url", example = "https://www.iocoder.cn") + private String contractFileUrl; + + @Schema(description = "流程状态", example = "2") + private String processStatus; + + @Schema(description = "外包合同id", example = "24736") + private Long outsContractId; + + @Schema(description = "版本") + private String version; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contractouts/ContractOutsDO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contractouts/ContractOutsDO.java new file mode 100644 index 000000000..9feb221d8 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contractouts/ContractOutsDO.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.cms.dal.dataobject.contractouts; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 外包合同关联 DO + * + * @author zqc + */ +@TableName("cms_contract_outs") +@KeySequence("cms_contract_outs_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ContractOutsDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 合同id + */ + private Long contractId; + /** + * 外包合同id + */ + private Long outsContractId; + /** + * 创建时间 + */ + private LocalDateTime cteateTime; + /** + * 更新人 + */ + private String updator; + /** + * 是否删除 + */ + private Boolean delete; + + /** + * 租户id + */ + private String tenantId; +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java new file mode 100644 index 000000000..89e326e14 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java @@ -0,0 +1,78 @@ +package cn.iocoder.yudao.module.cms.dal.dataobject.outscontract; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 外包合同 DO + * + * @author zqc + */ +@TableName("cms_outs_contract") +@KeySequence("cms_outs_contract_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OutsContractDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 项目id + */ + private Long projectId; + /** + * 合同名称 + */ + private String name; + /** + * 主合同id + */ + private Long contractId; + /** + * 类型 + * + * 枚举 {@link TODO contract_billing_type 对应的类} + */ + private String countType; + /** + * 合同金额 + */ + private BigDecimal amount; + /** + * 编号 + */ + private String code; + /** + * 专业 + * + * 枚举 {@link TODO major 对应的类} + */ + private String major; + /** + * 签订时间 + */ + private LocalDateTime signingTime; + /** + * 结算数 + */ + private BigDecimal settlementAmount; + /** + * 合同文件url + */ + private String contractFileUrl; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontracthistory/OutsContractHistoryDO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontracthistory/OutsContractHistoryDO.java new file mode 100644 index 000000000..7ce200da2 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontracthistory/OutsContractHistoryDO.java @@ -0,0 +1,94 @@ +package cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 外包合同历史 DO + * + * @author zqc + */ +@TableName("cms_outs_contract_history") +@KeySequence("cms_outs_contract_history_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OutsContractHistoryDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 项目id + */ + private Long projectId; + /** + * 合同名称 + */ + private String name; + /** + * 主合同id + */ + private Long contractId; + /** + * 类型 + * + * 枚举 {@link TODO contract_billing_type 对应的类} + */ + private String countType; + /** + * 合同金额 + */ + private BigDecimal amount; + /** + * 编号 + */ + private String code; + /** + * 专业 + * + * 枚举 {@link TODO major 对应的类} + */ + private String major; + /** + * 流程实体id + */ + private String processInstanceId; + /** + * 签订时间 + */ + private LocalDateTime signingTime; + /** + * 结算数 + */ + private BigDecimal settlementAmount; + /** + * 合同文件url + */ + private String contractFileUrl; + /** + * 流程状态 + */ + private String processStatus; + /** + * 外包合同id + */ + private Long outsContractId; + /** + * 版本 + */ + private String version; + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contractouts/ContractOutsMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contractouts/ContractOutsMapper.java new file mode 100644 index 000000000..a4bae5fd2 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contractouts/ContractOutsMapper.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.cms.dal.mysql.contractouts; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.cms.dal.dataobject.contractouts.ContractOutsDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.*; + +/** + * 外包合同关联 Mapper + * + * @author zqc + */ +@Mapper +public interface ContractOutsMapper extends BaseMapperX { + + default PageResult selectPage(ContractOutsPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ContractOutsDO::getContractId, reqVO.getContractId()) + .eqIfPresent(ContractOutsDO::getOutsContractId, reqVO.getOutsContractId()) + .eqIfPresent(ContractOutsDO::getCreator, reqVO.getCreator()) + .betweenIfPresent(ContractOutsDO::getCteateTime, reqVO.getCteateTime()) + .eqIfPresent(ContractOutsDO::getUpdator, reqVO.getUpdator()) + .betweenIfPresent(ContractOutsDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(ContractOutsDO::getDelete, reqVO.getDelete()) + .eqIfPresent(ContractOutsDO::getTenantId, reqVO.getTenantId()) + .orderByDesc(ContractOutsDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java new file mode 100644 index 000000000..91108ed73 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.cms.dal.mysql.outscontract; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*; + +/** + * 外包合同 Mapper + * + * @author zqc + */ +@Mapper +public interface OutsContractMapper extends BaseMapperX { + + default PageResult selectPage(OutsContractPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(OutsContractDO::getProjectId, reqVO.getProjectId()) + .likeIfPresent(OutsContractDO::getName, reqVO.getName()) + .eqIfPresent(OutsContractDO::getContractId, reqVO.getContractId()) + .eqIfPresent(OutsContractDO::getCountType, reqVO.getCountType()) + .eqIfPresent(OutsContractDO::getAmount, reqVO.getAmount()) + .eqIfPresent(OutsContractDO::getCode, reqVO.getCode()) + .eqIfPresent(OutsContractDO::getMajor, reqVO.getMajor()) + .betweenIfPresent(OutsContractDO::getSigningTime, reqVO.getSigningTime()) + .eqIfPresent(OutsContractDO::getSettlementAmount, reqVO.getSettlementAmount()) + .eqIfPresent(OutsContractDO::getContractFileUrl, reqVO.getContractFileUrl()) + .betweenIfPresent(OutsContractDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(OutsContractDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontracthistory/OutsContractHistoryMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontracthistory/OutsContractHistoryMapper.java new file mode 100644 index 000000000..9f0017b72 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontracthistory/OutsContractHistoryMapper.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*; + +/** + * 外包合同历史 Mapper + * + * @author zqc + */ +@Mapper +public interface OutsContractHistoryMapper extends BaseMapperX { + + default PageResult selectPage(OutsContractHistoryPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(OutsContractHistoryDO::getProjectId, reqVO.getProjectId()) + .likeIfPresent(OutsContractHistoryDO::getName, reqVO.getName()) + .eqIfPresent(OutsContractHistoryDO::getContractId, reqVO.getContractId()) + .eqIfPresent(OutsContractHistoryDO::getCountType, reqVO.getCountType()) + .eqIfPresent(OutsContractHistoryDO::getAmount, reqVO.getAmount()) + .eqIfPresent(OutsContractHistoryDO::getCode, reqVO.getCode()) + .eqIfPresent(OutsContractHistoryDO::getMajor, reqVO.getMajor()) + .eqIfPresent(OutsContractHistoryDO::getProcessInstanceId, reqVO.getProcessInstanceId()) + .betweenIfPresent(OutsContractHistoryDO::getSigningTime, reqVO.getSigningTime()) + .eqIfPresent(OutsContractHistoryDO::getSettlementAmount, reqVO.getSettlementAmount()) + .eqIfPresent(OutsContractHistoryDO::getContractFileUrl, reqVO.getContractFileUrl()) + .betweenIfPresent(OutsContractHistoryDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(OutsContractHistoryDO::getProcessStatus, reqVO.getProcessStatus()) + .eqIfPresent(OutsContractHistoryDO::getOutsContractId, reqVO.getOutsContractId()) + .eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion()) + .orderByDesc(OutsContractHistoryDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsService.java new file mode 100644 index 000000000..0407ef0ac --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.cms.service.contractouts; + +import java.util.*; +import jakarta.validation.*; +import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.contractouts.ContractOutsDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 外包合同关联 Service 接口 + * + * @author zqc + */ +public interface ContractOutsService { + + /** + * 创建外包合同关联 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createContractOuts(@Valid ContractOutsSaveReqVO createReqVO); + + /** + * 更新外包合同关联 + * + * @param updateReqVO 更新信息 + */ + void updateContractOuts(@Valid ContractOutsSaveReqVO updateReqVO); + + /** + * 删除外包合同关联 + * + * @param id 编号 + */ + void deleteContractOuts(Long id); + + /** + * 获得外包合同关联 + * + * @param id 编号 + * @return 外包合同关联 + */ + ContractOutsDO getContractOuts(Long id); + + /** + * 获得外包合同关联分页 + * + * @param pageReqVO 分页查询 + * @return 外包合同关联分页 + */ + PageResult getContractOutsPage(ContractOutsPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsServiceImpl.java new file mode 100644 index 000000000..2d88a2a6c --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.cms.service.contractouts; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.contractouts.ContractOutsDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.cms.dal.mysql.contractouts.ContractOutsMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*; + +/** + * 外包合同关联 Service 实现类 + * + * @author zqc + */ +@Service +@Validated +public class ContractOutsServiceImpl implements ContractOutsService { + + @Resource + private ContractOutsMapper contractOutsMapper; + + @Override + public Long createContractOuts(ContractOutsSaveReqVO createReqVO) { + // 插入 + ContractOutsDO contractOuts = BeanUtils.toBean(createReqVO, ContractOutsDO.class); + contractOutsMapper.insert(contractOuts); + // 返回 + return contractOuts.getId(); + } + + @Override + public void updateContractOuts(ContractOutsSaveReqVO updateReqVO) { + // 校验存在 + validateContractOutsExists(updateReqVO.getId()); + // 更新 + ContractOutsDO updateObj = BeanUtils.toBean(updateReqVO, ContractOutsDO.class); + contractOutsMapper.updateById(updateObj); + } + + @Override + public void deleteContractOuts(Long id) { + // 校验存在 + validateContractOutsExists(id); + // 删除 + contractOutsMapper.deleteById(id); + } + + private void validateContractOutsExists(Long id) { + if (contractOutsMapper.selectById(id) == null) { + throw exception(CONTRACT_OUTS_NOT_EXISTS); + } + } + + @Override + public ContractOutsDO getContractOuts(Long id) { + return contractOutsMapper.selectById(id); + } + + @Override + public PageResult getContractOutsPage(ContractOutsPageReqVO pageReqVO) { + return contractOutsMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java new file mode 100644 index 000000000..3ae3a594c --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.cms.service.outscontract; + +import java.util.*; +import jakarta.validation.*; +import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 外包合同 Service 接口 + * + * @author zqc + */ +public interface OutsContractService { + + /** + * 创建外包合同 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createOutsContract(@Valid OutsContractSaveReqVO createReqVO); + + /** + * 更新外包合同 + * + * @param updateReqVO 更新信息 + */ + void updateOutsContract(@Valid OutsContractSaveReqVO updateReqVO); + + /** + * 删除外包合同 + * + * @param id 编号 + */ + void deleteOutsContract(Long id); + + /** + * 获得外包合同 + * + * @param id 编号 + * @return 外包合同 + */ + OutsContractDO getOutsContract(Long id); + + /** + * 获得外包合同分页 + * + * @param pageReqVO 分页查询 + * @return 外包合同分页 + */ + PageResult getOutsContractPage(OutsContractPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java new file mode 100644 index 000000000..e6f4cb8c0 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.cms.service.outscontract; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*; + +/** + * 外包合同 Service 实现类 + * + * @author zqc + */ +@Service +@Validated +public class OutsContractServiceImpl implements OutsContractService { + + @Resource + private OutsContractMapper outsContractMapper; + + @Override + public Long createOutsContract(OutsContractSaveReqVO createReqVO) { + // 插入 + OutsContractDO outsContract = BeanUtils.toBean(createReqVO, OutsContractDO.class); + outsContractMapper.insert(outsContract); + // 返回 + return outsContract.getId(); + } + + @Override + public void updateOutsContract(OutsContractSaveReqVO updateReqVO) { + // 校验存在 + validateOutsContractExists(updateReqVO.getId()); + // 更新 + OutsContractDO updateObj = BeanUtils.toBean(updateReqVO, OutsContractDO.class); + outsContractMapper.updateById(updateObj); + } + + @Override + public void deleteOutsContract(Long id) { + // 校验存在 + validateOutsContractExists(id); + // 删除 + outsContractMapper.deleteById(id); + } + + private void validateOutsContractExists(Long id) { + if (outsContractMapper.selectById(id) == null) { + throw exception(OUTS_CONTRACT_NOT_EXISTS); + } + } + + @Override + public OutsContractDO getOutsContract(Long id) { + return outsContractMapper.selectById(id); + } + + @Override + public PageResult getOutsContractPage(OutsContractPageReqVO pageReqVO) { + return outsContractMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryService.java new file mode 100644 index 000000000..19fde3506 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.cms.service.outscontracthistory; + +import java.util.*; +import jakarta.validation.*; +import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 外包合同历史 Service 接口 + * + * @author zqc + */ +public interface OutsContractHistoryService { + + /** + * 创建外包合同历史 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createOutsContractHistory(@Valid OutsContractHistorySaveReqVO createReqVO); + + /** + * 更新外包合同历史 + * + * @param updateReqVO 更新信息 + */ + void updateOutsContractHistory(@Valid OutsContractHistorySaveReqVO updateReqVO); + + /** + * 删除外包合同历史 + * + * @param id 编号 + */ + void deleteOutsContractHistory(Long id); + + /** + * 获得外包合同历史 + * + * @param id 编号 + * @return 外包合同历史 + */ + OutsContractHistoryDO getOutsContractHistory(Long id); + + /** + * 获得外包合同历史分页 + * + * @param pageReqVO 分页查询 + * @return 外包合同历史分页 + */ + PageResult getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java new file mode 100644 index 000000000..b521705ce --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.cms.service.outscontracthistory; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*; +import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*; + +/** + * 外包合同历史 Service 实现类 + * + * @author zqc + */ +@Service +@Validated +public class OutsContractHistoryServiceImpl implements OutsContractHistoryService { + + @Resource + private OutsContractHistoryMapper outsContractHistoryMapper; + + @Override + public Long createOutsContractHistory(OutsContractHistorySaveReqVO createReqVO) { + // 插入 + OutsContractHistoryDO outsContractHistory = BeanUtils.toBean(createReqVO, OutsContractHistoryDO.class); + outsContractHistoryMapper.insert(outsContractHistory); + // 返回 + return outsContractHistory.getId(); + } + + @Override + public void updateOutsContractHistory(OutsContractHistorySaveReqVO updateReqVO) { + // 校验存在 + validateOutsContractHistoryExists(updateReqVO.getId()); + // 更新 + OutsContractHistoryDO updateObj = BeanUtils.toBean(updateReqVO, OutsContractHistoryDO.class); + outsContractHistoryMapper.updateById(updateObj); + } + + @Override + public void deleteOutsContractHistory(Long id) { + // 校验存在 + validateOutsContractHistoryExists(id); + // 删除 + outsContractHistoryMapper.deleteById(id); + } + + private void validateOutsContractHistoryExists(Long id) { + if (outsContractHistoryMapper.selectById(id) == null) { + throw exception(OUTS_CONTRACT_HISTORY_NOT_EXISTS); + } + } + + @Override + public OutsContractHistoryDO getOutsContractHistory(Long id) { + return outsContractHistoryMapper.selectById(id); + } + + @Override + public PageResult getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) { + return outsContractHistoryMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/contractouts/ContractOutsMapper.xml b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/contractouts/ContractOutsMapper.xml new file mode 100644 index 000000000..3a70b7830 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/contractouts/ContractOutsMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontract/OutsContractMapper.xml b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontract/OutsContractMapper.xml new file mode 100644 index 000000000..70c03c47e --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontract/OutsContractMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontracthistory/OutsContractHistoryMapper.xml b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontracthistory/OutsContractHistoryMapper.xml new file mode 100644 index 000000000..e97f67e89 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/outscontracthistory/OutsContractHistoryMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivables/ReceivablesMapper.xml b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivables/ReceivablesMapper.xml new file mode 100644 index 000000000..c643719b8 --- /dev/null +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivables/ReceivablesMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivableshistory/ReceivablesHistoryMapper.xml b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivableshistory/ReceivablesHistoryMapper.xml new file mode 100644 index 000000000..9e081f607 --- /dev/null +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/receivableshistory/ReceivablesHistoryMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsContractOuts/src/api/cms/contractouts/index.ts b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/api/cms/contractouts/index.ts new file mode 100644 index 000000000..2a2ead775 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/api/cms/contractouts/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +// 外包合同关联 VO +export interface ContractOutsVO { + id: number // 主键 + contractId: number // 合同id + outsContractId: number // 外包合同id + creator: string // 创建人 + cteateTime: Date // 创建时间 + updator: string // 更新人 + updateTime: Date // 更新时间 + delete: boolean // 是否删除 + tenantId: number // 租户id +} + +// 外包合同关联 API +export const ContractOutsApi = { + // 查询外包合同关联分页 + getContractOutsPage: async (params: any) => { + return await request.get({ url: `/cms/contract-outs/page`, params }) + }, + + // 查询外包合同关联详情 + getContractOuts: async (id: number) => { + return await request.get({ url: `/cms/contract-outs/get?id=` + id }) + }, + + // 新增外包合同关联 + createContractOuts: async (data: ContractOutsVO) => { + return await request.post({ url: `/cms/contract-outs/create`, data }) + }, + + // 修改外包合同关联 + updateContractOuts: async (data: ContractOutsVO) => { + return await request.put({ url: `/cms/contract-outs/update`, data }) + }, + + // 删除外包合同关联 + deleteContractOuts: async (id: number) => { + return await request.delete({ url: `/cms/contract-outs/delete?id=` + id }) + }, + + // 导出外包合同关联 Excel + exportContractOuts: async (params) => { + return await request.download({ url: `/cms/contract-outs/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/ContractOutsForm.vue b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/ContractOutsForm.vue new file mode 100644 index 000000000..828a0b742 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/ContractOutsForm.vue @@ -0,0 +1,144 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/index.vue b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/index.vue new file mode 100644 index 000000000..33613e9af --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsContractOuts/src/views/cms/contractouts/index.vue @@ -0,0 +1,262 @@ + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContract/src/api/cms/outscontract/index.ts b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/api/cms/outscontract/index.ts new file mode 100644 index 000000000..348be86d2 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/api/cms/outscontract/index.ts @@ -0,0 +1,49 @@ +import request from '@/config/axios' + +// 外包合同 VO +export interface OutsContractVO { + id: number // 主键 + projectId: number // 项目id + name: string // 合同名称 + contractId: number // 主合同id + countType: string // 类型 + amount: number // 合同金额 + code: string // 编号 + major: string // 专业 + signingTime: Date // 签订时间 + settlementAmount: number // 结算数 + contractFileUrl: string // 合同文件url +} + +// 外包合同 API +export const OutsContractApi = { + // 查询外包合同分页 + getOutsContractPage: async (params: any) => { + return await request.get({ url: `/cms/outs-contract/page`, params }) + }, + + // 查询外包合同详情 + getOutsContract: async (id: number) => { + return await request.get({ url: `/cms/outs-contract/get?id=` + id }) + }, + + // 新增外包合同 + createOutsContract: async (data: OutsContractVO) => { + return await request.post({ url: `/cms/outs-contract/create`, data }) + }, + + // 修改外包合同 + updateOutsContract: async (data: OutsContractVO) => { + return await request.put({ url: `/cms/outs-contract/update`, data }) + }, + + // 删除外包合同 + deleteOutsContract: async (id: number) => { + return await request.delete({ url: `/cms/outs-contract/delete?id=` + id }) + }, + + // 导出外包合同 Excel + exportOutsContract: async (params) => { + return await request.download({ url: `/cms/outs-contract/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/OutsContractForm.vue b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/OutsContractForm.vue new file mode 100644 index 000000000..76422ec0d --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/OutsContractForm.vue @@ -0,0 +1,157 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/index.vue b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/index.vue new file mode 100644 index 000000000..d957912a1 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContract/src/views/cms/outscontract/index.vue @@ -0,0 +1,306 @@ + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/api/cms/outscontracthistory/index.ts b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/api/cms/outscontracthistory/index.ts new file mode 100644 index 000000000..244f4956d --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/api/cms/outscontracthistory/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +// 外包合同历史 VO +export interface OutsContractHistoryVO { + id: number // 主键 + projectId: number // 项目id + name: string // 合同名称 + contractId: number // 主合同id + countType: string // 类型 + amount: number // 合同金额 + code: string // 编号 + major: string // 专业 + processInstanceId: string // 流程实体id + signingTime: Date // 签订时间 + settlementAmount: number // 结算数 + contractFileUrl: string // 合同文件url + processStatus: string // 流程状态 + outsContractId: number // 外包合同id + version: string // 版本 +} + +// 外包合同历史 API +export const OutsContractHistoryApi = { + // 查询外包合同历史分页 + getOutsContractHistoryPage: async (params: any) => { + return await request.get({ url: `/cms/outs-contract-history/page`, params }) + }, + + // 查询外包合同历史详情 + getOutsContractHistory: async (id: number) => { + return await request.get({ url: `/cms/outs-contract-history/get?id=` + id }) + }, + + // 新增外包合同历史 + createOutsContractHistory: async (data: OutsContractHistoryVO) => { + return await request.post({ url: `/cms/outs-contract-history/create`, data }) + }, + + // 修改外包合同历史 + updateOutsContractHistory: async (data: OutsContractHistoryVO) => { + return await request.put({ url: `/cms/outs-contract-history/update`, data }) + }, + + // 删除外包合同历史 + deleteOutsContractHistory: async (id: number) => { + return await request.delete({ url: `/cms/outs-contract-history/delete?id=` + id }) + }, + + // 导出外包合同历史 Excel + exportOutsContractHistory: async (params) => { + return await request.download({ url: `/cms/outs-contract-history/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/OutsContractHistoryForm.vue b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/OutsContractHistoryForm.vue new file mode 100644 index 000000000..7c9746fde --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/OutsContractHistoryForm.vue @@ -0,0 +1,172 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/index.vue b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/index.vue new file mode 100644 index 000000000..25270f3b5 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-CmsOutsContractHistory/src/views/cms/outscontracthistory/index.vue @@ -0,0 +1,345 @@ + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudget/src/api/pms/budget/index.ts b/yudao-ui/yudao-ui-admin-PmsBudget/src/api/pms/budget/index.ts new file mode 100644 index 000000000..f58fe440e --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudget/src/api/pms/budget/index.ts @@ -0,0 +1,50 @@ +import request from '@/config/axios' + +// 预算管理 VO +export interface BudgetVO { + id: number // 主键 + projectId: number // 项目id + contractId: number // 合同管理 + budgetFileUrl: string // 预算文件url + outsourcingCosts: number // 预算外包成本 + laborCosts: number // 人力成本 + accumulatedLaborCosts: number // 累计人力成本 + productCosts: number // 生产成本 + accumulatedProductCosts: number // 累计生产成本 + financialCosts: number // 财务成本 + accumulatedFinancialCosts: number // 累计财务成本 + collectionSituation: string // 回款情况 +} + +// 预算管理 API +export const BudgetApi = { + // 查询预算管理分页 + getBudgetPage: async (params: any) => { + return await request.get({ url: `/pms/budget/page`, params }) + }, + + // 查询预算管理详情 + getBudget: async (id: number) => { + return await request.get({ url: `/pms/budget/get?id=` + id }) + }, + + // 新增预算管理 + createBudget: async (data: BudgetVO) => { + return await request.post({ url: `/pms/budget/create`, data }) + }, + + // 修改预算管理 + updateBudget: async (data: BudgetVO) => { + return await request.put({ url: `/pms/budget/update`, data }) + }, + + // 删除预算管理 + deleteBudget: async (id: number) => { + return await request.delete({ url: `/pms/budget/delete?id=` + id }) + }, + + // 导出预算管理 Excel + exportBudget: async (params) => { + return await request.download({ url: `/pms/budget/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/BudgetForm.vue b/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/BudgetForm.vue new file mode 100644 index 000000000..ba2abb0e8 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/BudgetForm.vue @@ -0,0 +1,143 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/index.vue b/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/index.vue new file mode 100644 index 000000000..4c3a033e2 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudget/src/views/pms/budget/index.vue @@ -0,0 +1,288 @@ + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/api/pms/budgethistory/index.ts b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/api/pms/budgethistory/index.ts new file mode 100644 index 000000000..8c69be6da --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/api/pms/budgethistory/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +// 预算管理 VO +export interface BudgetHistoryVO { + id: number // 主键 + projectId: number // 项目id + contractId: number // 合同管理 + budgetFileUrl: string // 预算文件url + outsourcingCosts: number // 预算外包成本 + laborCosts: number // 人力成本 + accumulatedLaborCosts: number // 累计人力成本 + productCosts: number // 生产成本 + accumulatedProductCosts: number // 累计生产成本 + financialCosts: number // 财务成本 + accumulatedFinancialCosts: number // 累计财务成本 + collectionSituation: string // 回款情况 + processInstanceId: string // 流程实体id + processStatus: string // 流程状态 + budgetId: number // 预算id + version: string // 版本 +} + +// 预算管理 API +export const BudgetHistoryApi = { + // 查询预算管理分页 + getBudgetHistoryPage: async (params: any) => { + return await request.get({ url: `/pms/budget-history/page`, params }) + }, + + // 查询预算管理详情 + getBudgetHistory: async (id: number) => { + return await request.get({ url: `/pms/budget-history/get?id=` + id }) + }, + + // 新增预算管理 + createBudgetHistory: async (data: BudgetHistoryVO) => { + return await request.post({ url: `/pms/budget-history/create`, data }) + }, + + // 修改预算管理 + updateBudgetHistory: async (data: BudgetHistoryVO) => { + return await request.put({ url: `/pms/budget-history/update`, data }) + }, + + // 删除预算管理 + deleteBudgetHistory: async (id: number) => { + return await request.delete({ url: `/pms/budget-history/delete?id=` + id }) + }, + + // 导出预算管理 Excel + exportBudgetHistory: async (params) => { + return await request.download({ url: `/pms/budget-history/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/BudgetHistoryForm.vue b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/BudgetHistoryForm.vue new file mode 100644 index 000000000..60af88b41 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/BudgetHistoryForm.vue @@ -0,0 +1,165 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/index.vue b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/index.vue new file mode 100644 index 000000000..5540d4989 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsBudgetHistory/src/views/pms/budgethistory/index.vue @@ -0,0 +1,333 @@ + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivables/src/api/pms/receivables/index.ts b/yudao-ui/yudao-ui-admin-PmsReceivables/src/api/pms/receivables/index.ts new file mode 100644 index 000000000..1e6a5bab1 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivables/src/api/pms/receivables/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +export interface ReceivablesVO { + id: number + projectId: number + contractId: number + planStage: string + initialDesignStage: string + constructionDrawingStage: string + constructionStage: string + approveStage: string + collectionSituation: string +} + +// 查询应收款管理列表 +export const getReceivablesPage = async (params) => { + return await request.get({ url: '/pms/receivables/page', params }) +} + +// 查询应收款管理详情 +export const getReceivables = async (id: number) => { + return await request.get({ url: '/pms/receivables/get?id=' + id }) +} + +// 新增应收款管理 +export const createReceivables = async (data: ReceivablesVO) => { + return await request.post({ url: '/pms/receivables/create', data }) +} + +// 修改应收款管理 +export const updateReceivables = async (data: ReceivablesVO) => { + return await request.put({ url: '/pms/receivables/update', data }) +} + +// 删除应收款管理 +export const deleteReceivables = async (id: number) => { + return await request.delete({ url: '/pms/receivables/delete?id=' + id }) +} + +// 导出应收款管理 Excel +export const exportReceivablesApi = async (params) => { + return await request.download({ url: '/pms/receivables/export-excel', params }) +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/ReceivablesForm.vue b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/ReceivablesForm.vue new file mode 100644 index 000000000..9446cfb6c --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/ReceivablesForm.vue @@ -0,0 +1,65 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/index.vue b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/index.vue new file mode 100644 index 000000000..1a1ab5d01 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/index.vue @@ -0,0 +1,85 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/receivables.data.ts b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/receivables.data.ts new file mode 100644 index 000000000..4316f342f --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivables/src/views/pms/receivables/receivables.data.ts @@ -0,0 +1,85 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const rules = reactive({ + projectId: [required], +}) + +// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/ +const crudSchemas = reactive([ + { + label: '主键', + field: 'id', + isForm: false, + }, + { + label: '项目id', + field: 'projectId', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '主合同id ', + field: 'contractId', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '方案阶段比例', + field: 'planStage', + isSearch: true, + }, + { + label: '初设阶段比例', + field: 'initialDesignStage', + isSearch: true, + }, + { + label: '施工图阶段比例', + field: 'constructionDrawingStage', + isSearch: true, + }, + { + label: '施工配合阶段', + field: 'constructionStage', + isSearch: true, + }, + { + label: '审定阶段', + field: 'approveStage', + isSearch: true, + }, + { + label: '回款情况', + field: 'collectionSituation', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isForm: false + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/api/pms/receivableshistory/index.ts b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/api/pms/receivableshistory/index.ts new file mode 100644 index 000000000..6509a4118 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/api/pms/receivableshistory/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +export interface ReceivablesHistoryVO { + id: number + projectId: number + contractId: number + planStage: string + initialDesignStage: string + constructionDrawingStage: string + constructionStage: string + approveStage: string + collectionSituation: string + processInstanceId: string + processStatus: string + receivableId: number + version: string +} + +// 查询应收款管理历史记录列表 +export const getReceivablesHistoryPage = async (params) => { + return await request.get({ url: '/pms/receivables-history/page', params }) +} + +// 查询应收款管理历史记录详情 +export const getReceivablesHistory = async (id: number) => { + return await request.get({ url: '/pms/receivables-history/get?id=' + id }) +} + +// 新增应收款管理历史记录 +export const createReceivablesHistory = async (data: ReceivablesHistoryVO) => { + return await request.post({ url: '/pms/receivables-history/create', data }) +} + +// 修改应收款管理历史记录 +export const updateReceivablesHistory = async (data: ReceivablesHistoryVO) => { + return await request.put({ url: '/pms/receivables-history/update', data }) +} + +// 删除应收款管理历史记录 +export const deleteReceivablesHistory = async (id: number) => { + return await request.delete({ url: '/pms/receivables-history/delete?id=' + id }) +} + +// 导出应收款管理历史记录 Excel +export const exportReceivablesHistoryApi = async (params) => { + return await request.download({ url: '/pms/receivables-history/export-excel', params }) +} \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/ReceivablesHistoryForm.vue b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/ReceivablesHistoryForm.vue new file mode 100644 index 000000000..34982cc53 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/ReceivablesHistoryForm.vue @@ -0,0 +1,65 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/index.vue b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/index.vue new file mode 100644 index 000000000..c36cf0f14 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/index.vue @@ -0,0 +1,85 @@ + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/receivablesHistory.data.ts b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/receivablesHistory.data.ts new file mode 100644 index 000000000..24677a9c9 --- /dev/null +++ b/yudao-ui/yudao-ui-admin-PmsReceivablesHistory/src/views/pms/receivableshistory/receivablesHistory.data.ts @@ -0,0 +1,112 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const rules = reactive({ + projectId: [required], +}) + +// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/ +const crudSchemas = reactive([ + { + label: '主键', + field: 'id', + isForm: false, + }, + { + label: '项目id', + field: 'projectId', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '主合同id ', + field: 'contractId', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '方案阶段比例', + field: 'planStage', + isSearch: true, + }, + { + label: '初设阶段比例', + field: 'initialDesignStage', + isSearch: true, + }, + { + label: '施工图阶段比例', + field: 'constructionDrawingStage', + isSearch: true, + }, + { + label: '施工配合阶段', + field: 'constructionStage', + isSearch: true, + }, + { + label: '审定阶段', + field: 'approveStage', + isSearch: true, + }, + { + label: '回款情况', + field: 'collectionSituation', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '流程实体id', + field: 'processInstanceId', + isSearch: true, + }, + { + label: '流程状态', + field: 'processStatus', + isSearch: true, + form: { + component: 'Radio' + }, + }, + { + label: '应收款id', + field: 'receivableId', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '版本', + field: 'version', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) \ No newline at end of file