diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxContractInfoController.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxContractInfoController.java new file mode 100644 index 000000000..51cef1fd5 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxContractInfoController.java @@ -0,0 +1,106 @@ +package org.dromara.lx.manage.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +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.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.lx.manage.domain.bo.LxContractInfoBo; +import org.dromara.lx.manage.domain.vo.LxContractInfoVo; +import org.dromara.lx.manage.service.ILxContractInfoService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 合同信息 + * + * @author Lion Li + * @date 2025-05-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/manage/contractInfo") +public class LxContractInfoController extends BaseController { + + private final ILxContractInfoService lxContractInfoService; + + /** + * 查询合同信息列表 + */ + @SaCheckPermission("manage:contractInfo:list") + @GetMapping("/list") + public TableDataInfo list(LxContractInfoBo bo, PageQuery pageQuery) { + return lxContractInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出合同信息列表 + */ + @SaCheckPermission("manage:contractInfo:export") + @Log(title = "合同信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(LxContractInfoBo bo, HttpServletResponse response) { + List list = lxContractInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "合同信息", LxContractInfoVo.class, response); + } + + /** + * 获取合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("manage:contractInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(lxContractInfoService.queryById(id)); + } + + /** + * 新增合同信息 + */ + @SaCheckPermission("manage:contractInfo:add") + @Log(title = "合同信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody LxContractInfoBo bo) { + return toAjax(lxContractInfoService.insertByBo(bo)); + } + + /** + * 修改合同信息 + */ + @SaCheckPermission("manage:contractInfo:edit") + @Log(title = "合同信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody LxContractInfoBo bo) { + return toAjax(lxContractInfoService.updateByBo(bo)); + } + + /** + * 删除合同信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("manage:contractInfo:remove") + @Log(title = "合同信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(lxContractInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxCustomerInfoController.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxCustomerInfoController.java new file mode 100644 index 000000000..f2e7ecf54 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/controller/LxCustomerInfoController.java @@ -0,0 +1,106 @@ +package org.dromara.lx.manage.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +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.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.lx.manage.domain.bo.LxCustomerInfoBo; +import org.dromara.lx.manage.domain.vo.LxCustomerInfoVo; +import org.dromara.lx.manage.service.ILxCustomerInfoService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户信息 + * + * @author Lion Li + * @date 2025-05-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/customerInfo") +public class LxCustomerInfoController extends BaseController { + + private final ILxCustomerInfoService lxCustomerInfoService; + + /** + * 查询客户信息列表 + */ + @SaCheckPermission("system:customerInfo:list") + @GetMapping("/list") + public TableDataInfo list(LxCustomerInfoBo bo, PageQuery pageQuery) { + return lxCustomerInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户信息列表 + */ + @SaCheckPermission("system:customerInfo:export") + @Log(title = "客户信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(LxCustomerInfoBo bo, HttpServletResponse response) { + List list = lxCustomerInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "客户信息", LxCustomerInfoVo.class, response); + } + + /** + * 获取客户信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:customerInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(lxCustomerInfoService.queryById(id)); + } + + /** + * 新增客户信息 + */ + @SaCheckPermission("system:customerInfo:add") + @Log(title = "客户信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody LxCustomerInfoBo bo) { + return toAjax(lxCustomerInfoService.insertByBo(bo)); + } + + /** + * 修改客户信息 + */ + @SaCheckPermission("system:customerInfo:edit") + @Log(title = "客户信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody LxCustomerInfoBo bo) { + return toAjax(lxCustomerInfoService.updateByBo(bo)); + } + + /** + * 删除客户信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:customerInfo:remove") + @Log(title = "客户信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(lxCustomerInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxContractInfo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxContractInfo.java new file mode 100644 index 000000000..7d2dab4e6 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxContractInfo.java @@ -0,0 +1,59 @@ +package org.dromara.lx.manage.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 合同信息对象 lx_contract_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("lx_contract_info") +public class LxContractInfo extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 合同类型 + */ + private String contractType; + + /** + * 合同编码 + */ + private String contractCode; + + /** + * 备注 + */ + private String remark; + + /** + * + */ + @TableLogic + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxCustomerInfo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxCustomerInfo.java new file mode 100644 index 000000000..60032402e --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/LxCustomerInfo.java @@ -0,0 +1,59 @@ +package org.dromara.lx.manage.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 客户信息对象 lx_customer_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("lx_customer_info") +public class LxCustomerInfo extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 客户类型 + */ + private String customerType; + + /** + * 客户编码 + */ + private String customerCode; + + /** + * 备注 + */ + private String remark; + + /** + * + */ + @TableLogic + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxContractInfoBo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxContractInfoBo.java new file mode 100644 index 000000000..fedc570fb --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxContractInfoBo.java @@ -0,0 +1,49 @@ +package org.dromara.lx.manage.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.lx.manage.domain.LxContractInfo; + +/** + * 合同信息业务对象 lx_contract_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = LxContractInfo.class, reverseConvertGenerate = false) +public class LxContractInfoBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long id; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 合同类型 + */ + private String contractType; + + /** + * 合同编码 + */ + private String contractCode; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxCustomerInfoBo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxCustomerInfoBo.java new file mode 100644 index 000000000..60ddc3bac --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/bo/LxCustomerInfoBo.java @@ -0,0 +1,49 @@ +package org.dromara.lx.manage.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.lx.manage.domain.LxCustomerInfo; + +/** + * 客户信息业务对象 lx_customer_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = LxCustomerInfo.class, reverseConvertGenerate = false) +public class LxCustomerInfoBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = {EditGroup.class}) + private Long id; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 客户类型 + */ + private String customerType; + + /** + * 客户编码 + */ + private String customerCode; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxContractInfoVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxContractInfoVo.java new file mode 100644 index 000000000..4350449bb --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxContractInfoVo.java @@ -0,0 +1,58 @@ +package org.dromara.lx.manage.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.lx.manage.domain.LxContractInfo; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 合同信息视图对象 lx_contract_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = LxContractInfo.class) +public class LxContractInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 合同类型 + */ + @ExcelProperty(value = "合同类型") + private String contractType; + + /** + * 合同编码 + */ + @ExcelProperty(value = "合同编码") + private String contractCode; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxCustomerInfoVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxCustomerInfoVo.java new file mode 100644 index 000000000..ccd1d2dd4 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/domain/vo/LxCustomerInfoVo.java @@ -0,0 +1,58 @@ +package org.dromara.lx.manage.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.lx.manage.domain.LxCustomerInfo; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 客户信息视图对象 lx_customer_info + * + * @author Lion Li + * @date 2025-05-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = LxCustomerInfo.class) +public class LxCustomerInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称") + private String customerName; + + /** + * 客户类型 + */ + @ExcelProperty(value = "客户类型") + private String customerType; + + /** + * 客户编码 + */ + @ExcelProperty(value = "客户编码") + private String customerCode; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxContractInfoMapper.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxContractInfoMapper.java new file mode 100644 index 000000000..2356081ab --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxContractInfoMapper.java @@ -0,0 +1,16 @@ +package org.dromara.lx.manage.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.lx.manage.domain.LxContractInfo; +import org.dromara.lx.manage.domain.vo.LxContractInfoVo; + + +/** + * 合同信息Mapper接口 + * + * @author Lion Li + * @date 2025-05-19 + */ +public interface LxContractInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxCustomerInfoMapper.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxCustomerInfoMapper.java new file mode 100644 index 000000000..481cce352 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/mapper/LxCustomerInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.lx.manage.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.lx.manage.domain.LxCustomerInfo; +import org.dromara.lx.manage.domain.vo.LxCustomerInfoVo; + +/** + * 客户信息Mapper接口 + * + * @author Lion Li + * @date 2025-05-19 + */ +public interface LxCustomerInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxContractInfoService.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxContractInfoService.java new file mode 100644 index 000000000..c1f4251c6 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxContractInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.lx.manage.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.lx.manage.domain.bo.LxContractInfoBo; +import org.dromara.lx.manage.domain.vo.LxContractInfoVo; + +import java.util.Collection; +import java.util.List; + +/** + * 合同信息Service接口 + * + * @author Lion Li + * @date 2025-05-19 + */ +public interface ILxContractInfoService { + + /** + * 查询合同信息 + * + * @param id 主键 + * @return 合同信息 + */ + LxContractInfoVo queryById(Long id); + + /** + * 分页查询合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同信息分页列表 + */ + TableDataInfo queryPageList(LxContractInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的合同信息列表 + * + * @param bo 查询条件 + * @return 合同信息列表 + */ + List queryList(LxContractInfoBo bo); + + /** + * 新增合同信息 + * + * @param bo 合同信息 + * @return 是否新增成功 + */ + Boolean insertByBo(LxContractInfoBo bo); + + /** + * 修改合同信息 + * + * @param bo 合同信息 + * @return 是否修改成功 + */ + Boolean updateByBo(LxContractInfoBo bo); + + /** + * 校验并批量删除合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxCustomerInfoService.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxCustomerInfoService.java new file mode 100644 index 000000000..104b3ee9e --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/ILxCustomerInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.lx.manage.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.lx.manage.domain.bo.LxCustomerInfoBo; +import org.dromara.lx.manage.domain.vo.LxCustomerInfoVo; + +import java.util.Collection; +import java.util.List; + +/** + * 客户信息Service接口 + * + * @author Lion Li + * @date 2025-05-19 + */ +public interface ILxCustomerInfoService { + + /** + * 查询客户信息 + * + * @param id 主键 + * @return 客户信息 + */ + LxCustomerInfoVo queryById(Long id); + + /** + * 分页查询客户信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户信息分页列表 + */ + TableDataInfo queryPageList(LxCustomerInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户信息列表 + * + * @param bo 查询条件 + * @return 客户信息列表 + */ + List queryList(LxCustomerInfoBo bo); + + /** + * 新增客户信息 + * + * @param bo 客户信息 + * @return 是否新增成功 + */ + Boolean insertByBo(LxCustomerInfoBo bo); + + /** + * 修改客户信息 + * + * @param bo 客户信息 + * @return 是否修改成功 + */ + Boolean updateByBo(LxCustomerInfoBo bo); + + /** + * 校验并批量删除客户信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxContractInfoServiceImpl.java new file mode 100644 index 000000000..53f71aaec --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxContractInfoServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.lx.manage.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.lx.manage.domain.LxContractInfo; +import org.dromara.lx.manage.domain.bo.LxContractInfoBo; +import org.dromara.lx.manage.domain.vo.LxContractInfoVo; +import org.dromara.lx.manage.mapper.LxContractInfoMapper; +import org.dromara.lx.manage.service.ILxContractInfoService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 合同信息Service业务层处理 + * + * @author Lion Li + * @date 2025-05-19 + */ +@RequiredArgsConstructor +@Service +public class LxContractInfoServiceImpl implements ILxContractInfoService { + + private final LxContractInfoMapper baseMapper; + + /** + * 查询合同信息 + * + * @param id 主键 + * @return 合同信息 + */ + @Override + public LxContractInfoVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同信息分页列表 + */ + @Override + public TableDataInfo queryPageList(LxContractInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的合同信息列表 + * + * @param bo 查询条件 + * @return 合同信息列表 + */ + @Override + public List queryList(LxContractInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(LxContractInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(LxContractInfo::getId); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), LxContractInfo::getContractName, bo.getContractName()); + lqw.eq(StringUtils.isNotBlank(bo.getContractType()), LxContractInfo::getContractType, bo.getContractType()); + lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), LxContractInfo::getContractCode, bo.getContractCode()); + return lqw; + } + + /** + * 新增合同信息 + * + * @param bo 合同信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(LxContractInfoBo bo) { + LxContractInfo add = MapstructUtils.convert(bo, LxContractInfo.class); + validEntityBeforeSave(add); + add.setDelFlag(0); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改合同信息 + * + * @param bo 合同信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(LxContractInfoBo bo) { + LxContractInfo update = MapstructUtils.convert(bo, LxContractInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(LxContractInfo entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxCustomerInfoServiceImpl.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxCustomerInfoServiceImpl.java new file mode 100644 index 000000000..c545e1567 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/manage/service/impl/LxCustomerInfoServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.lx.manage.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.lx.manage.domain.LxCustomerInfo; +import org.dromara.lx.manage.domain.bo.LxCustomerInfoBo; +import org.dromara.lx.manage.domain.vo.LxCustomerInfoVo; +import org.dromara.lx.manage.mapper.LxCustomerInfoMapper; +import org.dromara.lx.manage.service.ILxCustomerInfoService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 客户信息Service业务层处理 + * + * @author Lion Li + * @date 2025-05-19 + */ +@RequiredArgsConstructor +@Service +public class LxCustomerInfoServiceImpl implements ILxCustomerInfoService { + + private final LxCustomerInfoMapper baseMapper; + + /** + * 查询客户信息 + * + * @param id 主键 + * @return 客户信息 + */ + @Override + public LxCustomerInfoVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询客户信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户信息分页列表 + */ + @Override + public TableDataInfo queryPageList(LxCustomerInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户信息列表 + * + * @param bo 查询条件 + * @return 客户信息列表 + */ + @Override + public List queryList(LxCustomerInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(LxCustomerInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(LxCustomerInfo::getId); + lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), LxCustomerInfo::getCustomerName, bo.getCustomerName()); + lqw.eq(StringUtils.isNotBlank(bo.getCustomerType()), LxCustomerInfo::getCustomerType, bo.getCustomerType()); + lqw.eq(StringUtils.isNotBlank(bo.getCustomerCode()), LxCustomerInfo::getCustomerCode, bo.getCustomerCode()); + return lqw; + } + + /** + * 新增客户信息 + * + * @param bo 客户信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(LxCustomerInfoBo bo) { + LxCustomerInfo add = MapstructUtils.convert(bo, LxCustomerInfo.class); + validEntityBeforeSave(add); + add.setDelFlag(0); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改客户信息 + * + * @param bo 客户信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(LxCustomerInfoBo bo) { + LxCustomerInfo update = MapstructUtils.convert(bo, LxCustomerInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(LxCustomerInfo entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除客户信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxContractInfoMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxContractInfoMapper.xml new file mode 100644 index 000000000..8419eb81e --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxContractInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxCustomerInfoMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxCustomerInfoMapper.xml new file mode 100644 index 000000000..f045f8f61 --- /dev/null +++ b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/manage/LxCustomerInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml index d195fafa3..ee8d2eae1 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/ruoyi-modules/ruoyi-workflow/pom.xml @@ -78,6 +78,10 @@ org.dromara.warm warm-flow-plugin-ui-sb-web + + org.dromara + ruoyi-system + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java index 4d6fc97fe..5ec864f6b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java @@ -18,6 +18,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.TestLeaveBo; import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.service.ILxOaLeaveService; import org.dromara.workflow.service.ITestLeaveService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -39,6 +40,19 @@ public class TestController extends BaseController { private final ITestLeaveService testLeaveService; + private final ILxOaLeaveService lxOaLeaveService; + + /** + * 查询请假列表 + */ + @SaCheckPermission("workflow:leave:list") + @GetMapping("/list1") + public void list(Long userId) { + userId = 1L; + String deptAdmin = lxOaLeaveService.getDeptAdmin(userId); +// return null; + } + /** * 查询请假列表 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ILxOaLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ILxOaLeaveService.java index 0a1ffddcb..e105637ad 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ILxOaLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ILxOaLeaveService.java @@ -44,4 +44,9 @@ public interface ILxOaLeaveService { * 校验并批量删除请假信息 */ Boolean deleteWithValidByIds(List ids); + + /** + * 校验并批量删除请假信息 + */ + String getDeptAdmin(Long userId); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/LxOaLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/LxOaLeaveServiceImpl.java index a74983418..4da7236e1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/LxOaLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/LxOaLeaveServiceImpl.java @@ -20,6 +20,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.service.ISysDeptService; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.LxOaLeave; import org.dromara.workflow.domain.bo.LxOaLeaveBo; @@ -49,6 +50,8 @@ public class LxOaLeaveServiceImpl implements ILxOaLeaveService { private final LxOaLeaveMapper baseMapper; private final WorkflowService workflowService; + private final ISysDeptService iSysDeptService; + /** * spel条件表达:判断小于2 * @@ -143,6 +146,12 @@ public class LxOaLeaveServiceImpl implements ILxOaLeaveService { return baseMapper.deleteByIds(ids) > 0; } + @Override + public String getDeptAdmin(Long userId) { + iSysDeptService.selectDeptListByRoleId(userId); + return null; + } + /** * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1'