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

dev
wanghao 2 months ago
commit c296aa6610

1
.gitignore vendored

@ -33,6 +33,7 @@ build/*
nbbuild/
nbdist/
.nb-gradle/
logs/
######################################################################
# Others

@ -104,7 +104,7 @@ public class TokenController {
Long userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
remoteMessageService.publishMessage(List.of(userId), "欢迎登录RuoYi-Cloud-Plus微服务管理系统");
remoteMessageService.publishMessage(List.of(userId), "欢迎登录海威经营管理信息化系统");
}, 5, TimeUnit.SECONDS);
return R.ok(loginVo);
}

@ -0,0 +1,77 @@
package org.dromara.common.core.enums;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* OA
*
* @author may
*/
@Getter
@AllArgsConstructor
public enum OAStatusEnum {
/**
*
*/
DRAFT("1", "暂存"),
/**
*
*/
APPROVING("2", "审批中"),
/**
*
*/
COMPLETED("3", "可用");
/**
*
*/
private final String status;
/**
*
*/
private final String desc;
private static final Map<String, OAStatusEnum> STATUS_MAP = Arrays.stream(OAStatusEnum.values())
.collect(Collectors.toConcurrentMap(OAStatusEnum::getStatus, Function.identity()));
/**
* BusinessStatusEnum
*
* @param status
* @return BusinessStatusEnum null
*/
public static OAStatusEnum getByStatus(String status) {
// 使用 STATUS_MAP 获取对应的枚举,若找不到则返回 null
return STATUS_MAP.get(status);
}
/**
*
*
* @param status
* @return
*/
public static String findByStatus(String status) {
if (StringUtils.isBlank(status)) {
return StrUtil.EMPTY;
}
OAStatusEnum statusEnum = STATUS_MAP.get(status);
return (statusEnum != null) ? statusEnum.getDesc() : StrUtil.EMPTY;
}
}

@ -105,6 +105,11 @@
<artifactId>ruoyi-api-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bus</artifactId>
</dependency>
</dependencies>
<build>

@ -76,8 +76,21 @@ public class ErpContractInfoController extends BaseController {
@Log(title = "合同信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
return toAjax(erpContractInfoService.insertByBo(bo));
public R<ErpContractInfoVo> add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
return R.ok(erpContractInfoService.insertByBo(bo));
}
/**
*
* @param bo
* @return
*/
@SaCheckPermission("oa/erp:contractInfo:add")
@Log(title = "合同信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/contractSubmitAndFlowStart")
public R<ErpContractInfoVo> contractSubmitAndFlowStart(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
return R.ok(erpContractInfoService.contractSubmitAndFlowStart(bo));
}
/**

@ -0,0 +1,116 @@
package org.dromara.oa.erp.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.oa.erp.domain.vo.ErpProjectContractsVo;
import org.dromara.oa.erp.domain.bo.ErpProjectContractsBo;
import org.dromara.oa.erp.service.IErpProjectContractsService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
*
* 访:/oa/erp/projectContracts
*
* @author Yinq
* @date 2025-10-24
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/erp/projectContracts")
public class ErpProjectContractsController extends BaseController {
private final IErpProjectContractsService erpProjectContractsService;
/**
*
*/
@SaCheckPermission("oa/erp:projectContracts:list")
@GetMapping("/list")
public TableDataInfo<ErpProjectContractsVo> list(ErpProjectContractsBo bo, PageQuery pageQuery) {
return erpProjectContractsService.queryPageList(bo, pageQuery);
}
/**
*
*/
@SaCheckPermission("oa/erp:projectContracts:export")
@Log(title = "项目关联合同", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ErpProjectContractsBo bo, HttpServletResponse response) {
List<ErpProjectContractsVo> list = erpProjectContractsService.queryList(bo);
ExcelUtil.exportExcel(list, "项目关联合同", ErpProjectContractsVo.class, response);
}
/**
*
*
* @param projectContractsId
*/
@SaCheckPermission("oa/erp:projectContracts:query")
@GetMapping("/{projectContractsId}")
public R<ErpProjectContractsVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("projectContractsId") Long projectContractsId) {
return R.ok(erpProjectContractsService.queryById(projectContractsId));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectContracts:add")
@Log(title = "项目关联合同", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectContractsBo bo) {
return toAjax(erpProjectContractsService.insertByBo(bo));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectContracts:edit")
@Log(title = "项目关联合同", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpProjectContractsBo bo) {
return toAjax(erpProjectContractsService.updateByBo(bo));
}
/**
*
*
* @param projectContractsIds
*/
@SaCheckPermission("oa/erp:projectContracts:remove")
@Log(title = "项目关联合同", businessType = BusinessType.DELETE)
@DeleteMapping("/{projectContractsIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("projectContractsIds") Long[] projectContractsIds) {
return toAjax(erpProjectContractsService.deleteWithValidByIds(List.of(projectContractsIds), true));
}
/**
*
*/
@GetMapping("/getErpProjectContractsList")
public R<List<ErpProjectContractsVo>> getErpProjectContractsList(ErpProjectContractsBo bo) {
List<ErpProjectContractsVo> list = erpProjectContractsService.queryList(bo);
return R.ok(list);
}
}

@ -0,0 +1,116 @@
package org.dromara.oa.erp.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.oa.erp.domain.vo.ErpProjectInfoVo;
import org.dromara.oa.erp.domain.bo.ErpProjectInfoBo;
import org.dromara.oa.erp.service.IErpProjectInfoService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
*
* 访:/oa/erp/projectInfo
*
* @author Yinq
* @date 2025-10-24
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/erp/projectInfo")
public class ErpProjectInfoController extends BaseController {
private final IErpProjectInfoService erpProjectInfoService;
/**
*
*/
@SaCheckPermission("oa/erp:projectInfo:list")
@GetMapping("/list")
public TableDataInfo<ErpProjectInfoVo> list(ErpProjectInfoBo bo, PageQuery pageQuery) {
return erpProjectInfoService.queryPageList(bo, pageQuery);
}
/**
*
*/
@SaCheckPermission("oa/erp:projectInfo:export")
@Log(title = "项目信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ErpProjectInfoBo bo, HttpServletResponse response) {
List<ErpProjectInfoVo> list = erpProjectInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "项目信息", ErpProjectInfoVo.class, response);
}
/**
*
*
* @param projectId
*/
@SaCheckPermission("oa/erp:projectInfo:query")
@GetMapping("/{projectId}")
public R<ErpProjectInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("projectId") Long projectId) {
return R.ok(erpProjectInfoService.queryById(projectId));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectInfo:add")
@Log(title = "项目信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectInfoBo bo) {
return toAjax(erpProjectInfoService.insertByBo(bo));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectInfo:edit")
@Log(title = "项目信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpProjectInfoBo bo) {
return toAjax(erpProjectInfoService.updateByBo(bo));
}
/**
*
*
* @param projectIds
*/
@SaCheckPermission("oa/erp:projectInfo:remove")
@Log(title = "项目信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{projectIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("projectIds") Long[] projectIds) {
return toAjax(erpProjectInfoService.deleteWithValidByIds(List.of(projectIds), true));
}
/**
*
*/
@GetMapping("/getErpProjectInfoList")
public R<List<ErpProjectInfoVo>> getErpProjectInfoList(ErpProjectInfoBo bo) {
List<ErpProjectInfoVo> list = erpProjectInfoService.queryList(bo);
return R.ok(list);
}
}

@ -0,0 +1,116 @@
package org.dromara.oa.erp.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.oa.erp.domain.vo.ErpProjectTypeVo;
import org.dromara.oa.erp.domain.bo.ErpProjectTypeBo;
import org.dromara.oa.erp.service.IErpProjectTypeService;
/**
*
* 访:/oa/erp/projectType
*
* @author Yinq
* @date 2025-10-24
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/erp/projectType")
public class ErpProjectTypeController extends BaseController {
private final IErpProjectTypeService erpProjectTypeService;
/**
*
*/
@SaCheckPermission("oa/erp:projectType:list")
@GetMapping("/list")
public R<List<ErpProjectTypeVo>> list(ErpProjectTypeBo bo) {
List<ErpProjectTypeVo> list = erpProjectTypeService.queryList(bo);
return R.ok(list);
}
/**
*
*/
@SaCheckPermission("oa/erp:projectType:export")
@Log(title = "项目类型信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ErpProjectTypeBo bo, HttpServletResponse response) {
List<ErpProjectTypeVo> list = erpProjectTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "项目类型信息", ErpProjectTypeVo.class, response);
}
/**
*
*
* @param projectTypeId
*/
@SaCheckPermission("oa/erp:projectType:query")
@GetMapping("/{projectTypeId}")
public R<ErpProjectTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("projectTypeId") Long projectTypeId) {
return R.ok(erpProjectTypeService.queryById(projectTypeId));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectType:add")
@Log(title = "项目类型信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectTypeBo bo) {
return toAjax(erpProjectTypeService.insertByBo(bo));
}
/**
*
*/
@SaCheckPermission("oa/erp:projectType:edit")
@Log(title = "项目类型信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpProjectTypeBo bo) {
return toAjax(erpProjectTypeService.updateByBo(bo));
}
/**
*
*
* @param projectTypeIds
*/
@SaCheckPermission("oa/erp:projectType:remove")
@Log(title = "项目类型信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{projectTypeIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("projectTypeIds") Long[] projectTypeIds) {
return toAjax(erpProjectTypeService.deleteWithValidByIds(List.of(projectTypeIds), true));
}
/**
*
*/
@GetMapping("/getErpProjectTypeList")
public R<List<ErpProjectTypeVo>> getErpProjectTypeList(ErpProjectTypeBo bo) {
List<ErpProjectTypeVo> list = erpProjectTypeService.queryList(bo);
return R.ok(list);
}
}

@ -0,0 +1,62 @@
package org.dromara.oa.erp.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* erp_project_contracts
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_project_contracts")
public class ErpProjectContracts extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@TableId(value = "project_contracts_id", type = IdType.AUTO)
private Long projectContractsId;
/**
* ID
*/
private Long projectId;
/**
* ID
*/
private Long contractId;
/**
*
*/
private Long sortOrder;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String activeFlag;
/**
* 0 1
*/
@TableLogic
private String delFlag;
}

@ -0,0 +1,138 @@
package org.dromara.oa.erp.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* erp_project_info
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_project_info")
public class ErpProjectInfo extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@TableId(value = "project_id", type = IdType.ASSIGN_ID)
private Long projectId;
/**
* 1 2
*/
private String contractFlag;
/**
*
*/
private String projectCode;
/**
*
*/
private String projectName;
/**
* 1 2 3 4 5 6 7
*/
private String businessDirection;
/**
* 1 2 3 4
*/
private String projectCategory;
/**
* 1 0
*/
private String spareFlag;
/**
* ID
*/
private Long projectTypeId;
/**
*
*/
private String paymentMethod;
/**
* ID
*/
private Long deptId;
/**
*
*/
private Long managerId;
/**
*
*/
private Long chargeId;
/**
*
*/
private Long deputyId;
/**
*
*/
private String peopleId;
/**
*
*/
private BigDecimal amount;
/**
* (1 2 3)
*/
private String projectStatus;
/**
*
*/
private String flowStatus;
/**
*
*/
private Long sortOrder;
/**
* ID()
*/
private Long contractId;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String activeFlag;
/**
* 0 1
*/
@TableLogic
private String delFlag;
}

@ -0,0 +1,67 @@
package org.dromara.oa.erp.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* erp_project_type
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_project_type")
public class ErpProjectType extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@TableId(value = "project_type_id", type = IdType.AUTO)
private Long projectTypeId;
/**
* ID
*/
private Long parentId;
/**
*
*/
private String typeName;
/**
*
*/
private Long sortOrder;
/**
* 1 0
*/
private String spareFlag;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String topFlag;
/**
* 0 1
*/
@TableLogic
private String delFlag;
}

@ -1,5 +1,6 @@
package org.dromara.oa.erp.domain.bo;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.oa.erp.domain.ErpContractInfo;
import org.dromara.common.mybatis.core.domain.BaseEntity;
@ -10,11 +11,11 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.oa.erp.domain.ErpContractMaterial;
import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt;
/**
* erp_contract_info
@ -198,4 +199,38 @@ public class ErpContractInfoBo extends BaseEntity {
*/
private String deptName;
/**
*
*/
private String flowCode;
/**
* ( )
*/
private String handler;
/**
* {'entity': {}}
*/
private Map<String, Object> variables;
/**
*
*/
private RemoteFlowInstanceBizExt bizExt;
public Map<String, Object> getVariables() {
if (variables == null) {
return new HashMap<>(16);
}
variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
return variables;
}
public RemoteFlowInstanceBizExt getBizExt() {
if (ObjectUtil.isNull(bizExt)) {
bizExt = new RemoteFlowInstanceBizExt();
}
return bizExt;
}
}

@ -0,0 +1,54 @@
package org.dromara.oa.erp.domain.bo;
import org.dromara.oa.erp.domain.ErpProjectContracts;
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.*;
/**
* erp_project_contracts
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ErpProjectContracts.class, reverseConvertGenerate = false)
public class ErpProjectContractsBo extends BaseEntity {
/**
* ID
*/
private Long projectContractsId;
/**
* ID
*/
private Long projectId;
/**
* ID
*/
private Long contractId;
/**
*
*/
private Long sortOrder;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String activeFlag;
}

@ -0,0 +1,135 @@
package org.dromara.oa.erp.domain.bo;
import org.dromara.oa.erp.domain.ErpProjectInfo;
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;
/**
* erp_project_info
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ErpProjectInfo.class, reverseConvertGenerate = false)
public class ErpProjectInfoBo extends BaseEntity {
/**
* ID
*/
private Long projectId;
/**
* 1 2
*/
@NotBlank(message = "有无合同1有 2无不能为空", groups = { AddGroup.class, EditGroup.class })
private String contractFlag;
/**
*
*/
@NotBlank(message = "项目编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectCode;
/**
*
*/
@NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectName;
/**
* 1 2 3 4 5 6 7
*/
@NotBlank(message = "业务方向1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售不能为空", groups = { AddGroup.class, EditGroup.class })
private String businessDirection;
/**
* 1 2 3 4
*/
@NotBlank(message = "项目类别1销售实施、物流 2销售备件 3研发 4预投不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectCategory;
/**
* 1 0
*/
private String spareFlag;
/**
* ID
*/
private Long projectTypeId;
/**
*
*/
private String paymentMethod;
/**
* ID
*/
private Long deptId;
/**
*
*/
private Long managerId;
/**
*
*/
private Long chargeId;
/**
*
*/
private Long deputyId;
/**
*
*/
private String peopleId;
/**
*
*/
private BigDecimal amount;
/**
* (1 2 3)
*/
private String projectStatus;
/**
*
*/
private String flowStatus;
/**
*
*/
private Long sortOrder;
/**
* ID()
*/
private Long contractId;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String activeFlag;
}

@ -0,0 +1,59 @@
package org.dromara.oa.erp.domain.bo;
import org.dromara.oa.erp.domain.ErpProjectType;
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.*;
/**
* erp_project_type
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ErpProjectType.class, reverseConvertGenerate = false)
public class ErpProjectTypeBo extends BaseEntity {
/**
* ID
*/
private Long projectTypeId;
/**
* ID
*/
private Long parentId;
/**
*
*/
private String typeName;
/**
*
*/
private Long sortOrder;
/**
* 1 0
*/
private String spareFlag;
/**
*
*/
private String remark;
/**
* 1 0
*/
private String topFlag;
}

@ -0,0 +1,69 @@
package org.dromara.oa.erp.domain.vo;
import org.dromara.oa.erp.domain.ErpProjectContracts;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.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;
/**
* erp_project_contracts
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ErpProjectContracts.class)
public class ErpProjectContractsVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ExcelProperty(value = "关联ID")
private Long projectContractsId;
/**
* ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* ID
*/
@ExcelProperty(value = "合同ID")
private Long contractId;
/**
*
*/
@ExcelProperty(value = "排序号")
private Long sortOrder;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 1 0
*/
@ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private String activeFlag;
}

@ -0,0 +1,165 @@
package org.dromara.oa.erp.domain.vo;
import java.math.BigDecimal;
import org.dromara.oa.erp.domain.ErpProjectInfo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.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;
/**
* erp_project_info
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ErpProjectInfo.class)
public class ErpProjectInfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 1 2
*/
@ExcelProperty(value = "有无合同", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "contract_flag")
private String contractFlag;
/**
*
*/
@ExcelProperty(value = "项目编号")
private String projectCode;
/**
*
*/
@ExcelProperty(value = "项目名称")
private String projectName;
/**
* 1 2 3 4 5 6 7
*/
@ExcelProperty(value = "业务方向", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "business_direction")
private String businessDirection;
/**
* 1 2 3 4
*/
@ExcelProperty(value = "项目类别", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "project_category")
private String projectCategory;
/**
* 1 0
*/
@ExcelProperty(value = "备件标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "spare_flag")
private String spareFlag;
/**
* ID
*/
@ExcelProperty(value = "项目类型ID")
private Long projectTypeId;
/**
*
*/
@ExcelProperty(value = "付款方式")
private String paymentMethod;
/**
* ID
*/
@ExcelProperty(value = "部门ID")
private Long deptId;
/**
*
*/
@ExcelProperty(value = "项目经理")
private Long managerId;
/**
*
*/
@ExcelProperty(value = "部门负责人")
private Long chargeId;
/**
*
*/
@ExcelProperty(value = "分管副总")
private Long deputyId;
/**
*
*/
@ExcelProperty(value = "抄送人员")
private String peopleId;
/**
*
*/
@ExcelProperty(value = "金额")
private BigDecimal amount;
/**
* (1 2 3)
*/
@ExcelProperty(value = "项目状态(1暂存 2审批中 3可用)", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "project_status")
private String projectStatus;
/**
*
*/
@ExcelProperty(value = "流程状态")
private String flowStatus;
/**
*
*/
@ExcelProperty(value = "排序号")
private Long sortOrder;
/**
* ID()
*/
@ExcelProperty(value = "合同ID(预留)")
private Long contractId;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 1 0
*/
@ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private String activeFlag;
}

@ -0,0 +1,76 @@
package org.dromara.oa.erp.domain.vo;
import org.dromara.oa.erp.domain.ErpProjectType;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.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;
/**
* erp_project_type
*
* @author Yinq
* @date 2025-10-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ErpProjectType.class)
public class ErpProjectTypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ExcelProperty(value = "项目类型ID")
private Long projectTypeId;
/**
* ID
*/
@ExcelProperty(value = "父级ID")
private Long parentId;
/**
*
*/
@ExcelProperty(value = "项目类型名称")
private String typeName;
/**
*
*/
@ExcelProperty(value = "排序号")
private Long sortOrder;
/**
* 1 0
*/
@ExcelProperty(value = "备件标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "spare_flag")
private String spareFlag;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 1 0
*/
@ExcelProperty(value = "顶级标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "top_flag")
private String topFlag;
}

@ -5,6 +5,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.annotation.DataColumn;
import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.oa.erp.domain.ErpContractInfo;
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -24,6 +26,10 @@ public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, E
* @param queryWrapper
* @return
*/
@DataPermission({
@DataColumn(key = "deptName", value = "t.dept_id"),
@DataColumn(key = "userName", value = "t.create_by")
})
public Page<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param("page") Page<ErpContractInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);
/**
@ -32,6 +38,10 @@ public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, E
* @param queryWrapper
* @return
*/
@DataPermission({
@DataColumn(key = "deptName", value = "t.dept_id"),
@DataColumn(key = "userName", value = "t.create_by")
})
public List<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);
}

@ -0,0 +1,37 @@
package org.dromara.oa.erp.mapper;
import java.util.List;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.oa.erp.domain.ErpProjectContracts;
import org.dromara.oa.erp.domain.vo.ErpProjectContractsVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* Mapper
*
* @author Yinq
* @date 2025-10-24
*/
public interface ErpProjectContractsMapper extends BaseMapperPlus<ErpProjectContracts, ErpProjectContractsVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<ErpProjectContractsVo> selectCustomErpProjectContractsVoList(@Param("page") Page<ErpProjectContractsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectContracts> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<ErpProjectContractsVo> selectCustomErpProjectContractsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectContracts> queryWrapper);
}

@ -0,0 +1,37 @@
package org.dromara.oa.erp.mapper;
import java.util.List;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.oa.erp.domain.ErpProjectInfo;
import org.dromara.oa.erp.domain.vo.ErpProjectInfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* Mapper
*
* @author Yinq
* @date 2025-10-24
*/
public interface ErpProjectInfoMapper extends BaseMapperPlus<ErpProjectInfo, ErpProjectInfoVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<ErpProjectInfoVo> selectCustomErpProjectInfoVoList(@Param("page") Page<ErpProjectInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectInfo> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<ErpProjectInfoVo> selectCustomErpProjectInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectInfo> queryWrapper);
}

@ -0,0 +1,37 @@
package org.dromara.oa.erp.mapper;
import java.util.List;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.oa.erp.domain.ErpProjectType;
import org.dromara.oa.erp.domain.vo.ErpProjectTypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* Mapper
*
* @author Yinq
* @date 2025-10-24
*/
public interface ErpProjectTypeMapper extends BaseMapperPlus<ErpProjectType, ErpProjectTypeVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<ErpProjectTypeVo> selectCustomErpProjectTypeVoList(@Param("page") Page<ErpProjectTypeVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectType> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<ErpProjectTypeVo> selectCustomErpProjectTypeVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectType> queryWrapper);
}

@ -48,7 +48,7 @@ public interface IErpContractInfoService {
* @param bo
* @return
*/
Boolean insertByBo(ErpContractInfoBo bo);
ErpContractInfoVo insertByBo(ErpContractInfoBo bo);
/**
*
@ -66,4 +66,11 @@ public interface IErpContractInfoService {
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
*
* @param bo
* @return
*/
ErpContractInfoVo contractSubmitAndFlowStart(ErpContractInfoBo bo);
}

@ -0,0 +1,69 @@
package org.dromara.oa.erp.service;
import org.dromara.oa.erp.domain.ErpProjectContracts;
import org.dromara.oa.erp.domain.vo.ErpProjectContractsVo;
import org.dromara.oa.erp.domain.bo.ErpProjectContractsBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
public interface IErpProjectContractsService {
/**
*
*
* @param projectContractsId
* @return
*/
ErpProjectContractsVo queryById(Long projectContractsId);
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<ErpProjectContractsVo> queryPageList(ErpProjectContractsBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<ErpProjectContractsVo> queryList(ErpProjectContractsBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean insertByBo(ErpProjectContractsBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean updateByBo(ErpProjectContractsBo bo);
/**
*
*
* @param ids
* @param isValid
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

@ -0,0 +1,69 @@
package org.dromara.oa.erp.service;
import org.dromara.oa.erp.domain.ErpProjectInfo;
import org.dromara.oa.erp.domain.vo.ErpProjectInfoVo;
import org.dromara.oa.erp.domain.bo.ErpProjectInfoBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
public interface IErpProjectInfoService {
/**
*
*
* @param projectId
* @return
*/
ErpProjectInfoVo queryById(Long projectId);
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<ErpProjectInfoVo> queryPageList(ErpProjectInfoBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<ErpProjectInfoVo> queryList(ErpProjectInfoBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean insertByBo(ErpProjectInfoBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean updateByBo(ErpProjectInfoBo bo);
/**
*
*
* @param ids
* @param isValid
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

@ -0,0 +1,59 @@
package org.dromara.oa.erp.service;
import org.dromara.oa.erp.domain.ErpProjectType;
import org.dromara.oa.erp.domain.vo.ErpProjectTypeVo;
import org.dromara.oa.erp.domain.bo.ErpProjectTypeBo;
import java.util.Collection;
import java.util.List;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
public interface IErpProjectTypeService {
/**
*
*
* @param projectTypeId
* @return
*/
ErpProjectTypeVo queryById(Long projectTypeId);
/**
*
*
* @param bo
* @return
*/
List<ErpProjectTypeVo> queryList(ErpProjectTypeBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean insertByBo(ErpProjectTypeBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean updateByBo(ErpProjectTypeBo bo);
/**
*
*
* @param ids
* @param isValid
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

@ -1,5 +1,12 @@
package org.dromara.oa.erp.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.map.MapUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.seata.spring.annotation.GlobalTransactional;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.enums.OAStatusEnum;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@ -9,8 +16,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.oa.erp.domain.ErpContractMaterial;
import org.dromara.oa.erp.mapper.ErpContractMaterialMapper;
import org.dromara.workflow.api.RemoteWorkflowService;
import org.dromara.workflow.api.domain.RemoteStartProcess;
import org.dromara.workflow.api.event.ProcessEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.dromara.oa.erp.domain.bo.ErpContractInfoBo;
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
@ -19,10 +31,7 @@ import org.dromara.oa.erp.mapper.ErpContractInfoMapper;
import org.dromara.oa.erp.service.IErpContractInfoService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -33,12 +42,16 @@ import java.util.stream.Collectors;
*/
@RequiredArgsConstructor
@Service
@Slf4j
public class ErpContractInfoServiceImpl implements IErpContractInfoService {
private final ErpContractInfoMapper baseMapper;
private final ErpContractMaterialMapper contractMaterialMapper;
@DubboReference(timeout = 30000)
private RemoteWorkflowService remoteWorkflowService;
/**
*
*
@ -47,7 +60,13 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
*/
@Override
public ErpContractInfoVo queryById(Long contractId) {
return baseMapper.selectVoById(contractId);
ErpContractInfoVo contractInfoVo = baseMapper.selectVoById(contractId);
MPJLambdaWrapper<ErpContractMaterial> lqw = JoinWrappers.lambda(ErpContractMaterial.class)
.selectAll(ErpContractMaterial.class)
.eq(contractId != null, ErpContractMaterial::getContractId, contractId);
List<ErpContractMaterial> contractMaterialList = contractMaterialMapper.selectList(lqw);
contractInfoVo.setContractMaterialList(contractMaterialList);
return contractInfoVo;
}
/**
@ -96,7 +115,8 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractInfo::getPaymentMethod, bo.getPaymentMethod())
.eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix())
.eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag());
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag())
.orderByDesc(ErpContractInfo::getCreateTime);
return lqw;
}
@ -108,7 +128,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(ErpContractInfoBo bo) {
public ErpContractInfoVo insertByBo(ErpContractInfoBo bo) {
ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class);
validEntityBeforeSave(add);
List<ErpContractMaterial> contractMaterialList = bo.getContractMaterialList();
@ -120,7 +140,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
contractMaterialMapper.insert(erpContractMaterial);
}
}
return flag;
return MapstructUtils.convert(add, ErpContractInfoVo.class);
}
/**
@ -179,4 +199,59 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
}
return baseMapper.deleteByIds(ids) > 0;
}
/**
*
*
* @param bo
* @return
*/
@Override
@GlobalTransactional(rollbackFor = Exception.class)
public ErpContractInfoVo contractSubmitAndFlowStart(ErpContractInfoBo bo) {
ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class);
validEntityBeforeSave(add);
if (StringUtils.isNull(bo.getContractId())) {
this.insertByBo(bo);
} else {
this.updateByBo(bo);
}
// 后端发起需要忽略权限
bo.getVariables().put("ignore", true);
RemoteStartProcess startProcess = new RemoteStartProcess();
startProcess.setBusinessId(bo.getContractId().toString());
startProcess.setFlowCode(bo.getFlowCode());
startProcess.setVariables(bo.getVariables());
startProcess.setBizExt(bo.getBizExt());
bo.getBizExt().setBusinessId(startProcess.getBusinessId());
boolean flagOne = remoteWorkflowService.startCompleteTask(startProcess);
if (!flagOne) {
throw new ServiceException("流程发起异常");
}
return MapstructUtils.convert(add, ErpContractInfoVo.class);
}
/**
* (: 稿退)
*
* @param processEvent
*/
@EventListener(condition = "#processEvent.flowCode =='OAC'")
public void processHandler(ProcessEvent processEvent) {
TenantHelper.dynamic(processEvent.getTenantId(), () -> {
log.info("当前任务执行了{}", processEvent.toString());
ErpContractInfo contractInfo = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
contractInfo.setFlowStatus(processEvent.getStatus());
Map<String, Object> params = processEvent.getParams();
if (MapUtil.isNotEmpty(params)) {
// 办理人
String handler = Convert.toStr(params.get("handler"));
}
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
contractInfo.setContractStatus(OAStatusEnum.COMPLETED.getStatus());
}
baseMapper.updateById(contractInfo);
});
}
}

@ -0,0 +1,134 @@
package org.dromara.oa.erp.service.impl;
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.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.oa.erp.domain.bo.ErpProjectContractsBo;
import org.dromara.oa.erp.domain.vo.ErpProjectContractsVo;
import org.dromara.oa.erp.domain.ErpProjectContracts;
import org.dromara.oa.erp.mapper.ErpProjectContractsMapper;
import org.dromara.oa.erp.service.IErpProjectContractsService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
@RequiredArgsConstructor
@Service
public class ErpProjectContractsServiceImpl implements IErpProjectContractsService {
private final ErpProjectContractsMapper baseMapper;
/**
*
*
* @param projectContractsId
* @return
*/
@Override
public ErpProjectContractsVo queryById(Long projectContractsId) {
return baseMapper.selectVoById(projectContractsId);
}
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
@Override
public TableDataInfo<ErpProjectContractsVo> queryPageList(ErpProjectContractsBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ErpProjectContracts> lqw = buildQueryWrapper(bo);
Page<ErpProjectContractsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ErpProjectContractsVo> queryList(ErpProjectContractsBo bo) {
MPJLambdaWrapper<ErpProjectContracts> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ErpProjectContracts> buildQueryWrapper(ErpProjectContractsBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ErpProjectContracts> lqw = JoinWrappers.lambda(ErpProjectContracts.class)
.selectAll(ErpProjectContracts.class)
.eq(bo.getProjectId() != null, ErpProjectContracts::getProjectId, bo.getProjectId())
.eq(bo.getContractId() != null, ErpProjectContracts::getContractId, bo.getContractId())
.eq(bo.getSortOrder() != null, ErpProjectContracts::getSortOrder, bo.getSortOrder())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectContracts::getActiveFlag, bo.getActiveFlag());
return lqw;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean insertByBo(ErpProjectContractsBo bo) {
ErpProjectContracts add = MapstructUtils.convert(bo, ErpProjectContracts.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setProjectContractsId(add.getProjectContractsId());
}
return flag;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean updateByBo(ErpProjectContractsBo bo) {
ErpProjectContracts update = MapstructUtils.convert(bo, ErpProjectContracts.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
*
*/
private void validEntityBeforeSave(ErpProjectContracts entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
*
*
* @param ids
* @param isValid
* @return
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,150 @@
package org.dromara.oa.erp.service.impl;
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.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.oa.erp.domain.bo.ErpProjectInfoBo;
import org.dromara.oa.erp.domain.vo.ErpProjectInfoVo;
import org.dromara.oa.erp.domain.ErpProjectInfo;
import org.dromara.oa.erp.mapper.ErpProjectInfoMapper;
import org.dromara.oa.erp.service.IErpProjectInfoService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
@RequiredArgsConstructor
@Service
public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
private final ErpProjectInfoMapper baseMapper;
/**
*
*
* @param projectId
* @return
*/
@Override
public ErpProjectInfoVo queryById(Long projectId){
return baseMapper.selectVoById(projectId);
}
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
@Override
public TableDataInfo<ErpProjectInfoVo> queryPageList(ErpProjectInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ErpProjectInfo> lqw = buildQueryWrapper(bo);
Page<ErpProjectInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ErpProjectInfoVo> queryList(ErpProjectInfoBo bo) {
MPJLambdaWrapper<ErpProjectInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ErpProjectInfo> buildQueryWrapper(ErpProjectInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ErpProjectInfo> lqw = JoinWrappers.lambda(ErpProjectInfo.class)
.selectAll(ErpProjectInfo.class)
.eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpProjectInfo::getContractFlag, bo.getContractFlag())
.eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectInfo::getProjectCode, bo.getProjectCode())
.like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectInfo::getProjectName, bo.getProjectName())
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpProjectInfo::getBusinessDirection, bo.getBusinessDirection())
.eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, bo.getProjectCategory())
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectInfo::getSpareFlag, bo.getSpareFlag())
.eq(bo.getProjectTypeId() != null, ErpProjectInfo::getProjectTypeId, bo.getProjectTypeId())
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpProjectInfo::getPaymentMethod, bo.getPaymentMethod())
.eq(bo.getDeptId() != null, ErpProjectInfo::getDeptId, bo.getDeptId())
.eq(bo.getManagerId() != null, ErpProjectInfo::getManagerId, bo.getManagerId())
.eq(bo.getChargeId() != null, ErpProjectInfo::getChargeId, bo.getChargeId())
.eq(bo.getDeputyId() != null, ErpProjectInfo::getDeputyId, bo.getDeputyId())
.eq(StringUtils.isNotBlank(bo.getPeopleId()), ErpProjectInfo::getPeopleId, bo.getPeopleId())
.eq(bo.getAmount() != null, ErpProjectInfo::getAmount, bo.getAmount())
.eq(StringUtils.isNotBlank(bo.getProjectStatus()), ErpProjectInfo::getProjectStatus, bo.getProjectStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectInfo::getFlowStatus, bo.getFlowStatus())
.eq(bo.getSortOrder() != null, ErpProjectInfo::getSortOrder, bo.getSortOrder())
.eq(bo.getContractId() != null, ErpProjectInfo::getContractId, bo.getContractId())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectInfo::getActiveFlag, bo.getActiveFlag())
;
return lqw;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean insertByBo(ErpProjectInfoBo bo) {
ErpProjectInfo add = MapstructUtils.convert(bo, ErpProjectInfo.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setProjectId(add.getProjectId());
}
return flag;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean updateByBo(ErpProjectInfoBo bo) {
ErpProjectInfo update = MapstructUtils.convert(bo, ErpProjectInfo.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
*
*/
private void validEntityBeforeSave(ErpProjectInfo entity){
//TODO 做一些数据校验,如唯一约束
}
/**
*
*
* @param ids
* @param isValid
* @return
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,119 @@
package org.dromara.oa.erp.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.oa.erp.domain.bo.ErpProjectTypeBo;
import org.dromara.oa.erp.domain.vo.ErpProjectTypeVo;
import org.dromara.oa.erp.domain.ErpProjectType;
import org.dromara.oa.erp.mapper.ErpProjectTypeMapper;
import org.dromara.oa.erp.service.IErpProjectTypeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service
*
* @author Yinq
* @date 2025-10-24
*/
@RequiredArgsConstructor
@Service
public class ErpProjectTypeServiceImpl implements IErpProjectTypeService {
private final ErpProjectTypeMapper baseMapper;
/**
*
*
* @param projectTypeId
* @return
*/
@Override
public ErpProjectTypeVo queryById(Long projectTypeId) {
return baseMapper.selectVoById(projectTypeId);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ErpProjectTypeVo> queryList(ErpProjectTypeBo bo) {
MPJLambdaWrapper<ErpProjectType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ErpProjectType> buildQueryWrapper(ErpProjectTypeBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ErpProjectType> lqw = JoinWrappers.lambda(ErpProjectType.class)
.selectAll(ErpProjectType.class)
.eq(bo.getParentId() != null, ErpProjectType::getParentId, bo.getParentId())
.like(StringUtils.isNotBlank(bo.getTypeName()), ErpProjectType::getTypeName, bo.getTypeName())
.eq(bo.getSortOrder() != null, ErpProjectType::getSortOrder, bo.getSortOrder())
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectType::getSpareFlag, bo.getSpareFlag())
.eq(StringUtils.isNotBlank(bo.getTopFlag()), ErpProjectType::getTopFlag, bo.getTopFlag());
return lqw;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean insertByBo(ErpProjectTypeBo bo) {
ErpProjectType add = MapstructUtils.convert(bo, ErpProjectType.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setProjectTypeId(add.getProjectTypeId());
}
return flag;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean updateByBo(ErpProjectTypeBo bo) {
ErpProjectType update = MapstructUtils.convert(bo, ErpProjectType.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
*
*/
private void validEntityBeforeSave(ErpProjectType entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
*
*
* @param ids
* @param isValid
* @return
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.erp.mapper.ErpProjectContractsMapper">
<resultMap type="org.dromara.oa.erp.domain.vo.ErpProjectContractsVo" id="ErpProjectContractsResult">
</resultMap>
<select id="selectCustomErpProjectContractsVoList" resultMap="ErpProjectContractsResult">
select project_contracts_id, tenant_id, project_id, contract_id, sort_order, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_project_contracts t
${ew.getCustomSqlSegment}
</select>
</mapper>

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.erp.mapper.ErpProjectInfoMapper">
<resultMap type="org.dromara.oa.erp.domain.vo.ErpProjectInfoVo" id="ErpProjectInfoResult">
</resultMap>
<select id="selectCustomErpProjectInfoVoList" resultMap="ErpProjectInfoResult">
select project_id, tenant_id, contract_flag, project_code, project_name, business_direction, project_category, spare_flag, project_type_id, payment_method, dept_id, manager_id, charge_id, deputy_id, people_id, amount, project_status, flow_status, sort_order, contract_id, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_project_info t
${ew.getCustomSqlSegment}
</select>
</mapper>

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.erp.mapper.ErpProjectTypeMapper">
<resultMap type="org.dromara.oa.erp.domain.vo.ErpProjectTypeVo" id="ErpProjectTypeResult">
</resultMap>
<select id="selectCustomErpProjectTypeVoList" resultMap="ErpProjectTypeResult">
select project_type_id, tenant_id, parent_id, type_name, sort_order, spare_flag, remark, top_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_project_type t
${ew.getCustomSqlSegment}
</select>
</mapper>

@ -143,4 +143,14 @@ public class SysDeptController extends BaseController {
return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
}
/**
*
* @param dept
* @return
*/
@GetMapping("/allListDept")
public R<List<SysDeptVo>> allListDept(SysDeptBo dept) {
return R.ok(deptService.selectAllListDept(dept));
}
}

@ -144,4 +144,6 @@ public interface ISysDeptService {
*/
int deleteDeptById(Long deptId);
List<SysDeptVo> selectAllListDept(SysDeptBo dept);
}

@ -85,7 +85,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override
public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
List<SysDeptVo> depts = baseMapper.selectVoList(lqw);
return buildDeptTreeSelect(depts);
}
@ -381,4 +381,10 @@ public class SysDeptServiceImpl implements ISysDeptService {
return baseMapper.deleteById(deptId);
}
@Override
public List<SysDeptVo> selectAllListDept(SysDeptBo dept) {
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(dept);
return baseMapper.selectVoList(lqw);
}
}

@ -58,7 +58,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
Page<SysUserVo> page = baseMapper.selectVoPage(pageQuery.build(), this.buildQueryWrapper(user));
return TableDataInfo.build(page);
}

Loading…
Cancel
Save