16 changed files with 763 additions and 242 deletions
@ -0,0 +1,105 @@ |
|||
package org.dromara.productManagement.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.productManagement.domain.vo.ContractualTaskTypeVo; |
|||
import org.dromara.productManagement.domain.bo.ContractualTaskTypeBo; |
|||
import org.dromara.productManagement.service.IContractualTaskTypeService; |
|||
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|||
|
|||
/** |
|||
* 合同类型 |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
@Validated |
|||
@RequiredArgsConstructor |
|||
@RestController |
|||
@RequestMapping("/productManagement/ContractualTaskType") |
|||
public class ContractualTaskTypeController extends BaseController { |
|||
|
|||
private final IContractualTaskTypeService contractualTaskTypeService; |
|||
|
|||
/** |
|||
* 查询合同类型列表 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:list") |
|||
@GetMapping("/list") |
|||
public R<List<ContractualTaskTypeVo>> list(ContractualTaskTypeBo bo) { |
|||
return R.ok(contractualTaskTypeService.queryList(bo)); |
|||
} |
|||
|
|||
/** |
|||
* 导出合同类型列表 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:export") |
|||
@Log(title = "合同类型", businessType = BusinessType.EXPORT) |
|||
@PostMapping("/export") |
|||
public void export(ContractualTaskTypeBo bo, HttpServletResponse response) { |
|||
List<ContractualTaskTypeVo> list = contractualTaskTypeService.queryList(bo); |
|||
ExcelUtil.exportExcel(list, "合同类型", ContractualTaskTypeVo.class, response); |
|||
} |
|||
|
|||
/** |
|||
* 获取合同类型详细信息 |
|||
* |
|||
* @param id 主键 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:query") |
|||
@GetMapping("/{id}") |
|||
public R<ContractualTaskTypeVo> getInfo(@NotNull(message = "主键不能为空") |
|||
@PathVariable Long id) { |
|||
return R.ok(contractualTaskTypeService.queryById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 新增合同类型 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:add") |
|||
@Log(title = "合同类型", businessType = BusinessType.INSERT) |
|||
@RepeatSubmit() |
|||
@PostMapping() |
|||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ContractualTaskTypeBo bo) { |
|||
return toAjax(contractualTaskTypeService.insertByBo(bo)); |
|||
} |
|||
|
|||
/** |
|||
* 修改合同类型 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:edit") |
|||
@Log(title = "合同类型", businessType = BusinessType.UPDATE) |
|||
@RepeatSubmit() |
|||
@PutMapping() |
|||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ContractualTaskTypeBo bo) { |
|||
return toAjax(contractualTaskTypeService.updateByBo(bo)); |
|||
} |
|||
|
|||
/** |
|||
* 删除合同类型 |
|||
* |
|||
* @param ids 主键串 |
|||
*/ |
|||
@SaCheckPermission("productManagement:ContractualTaskType:remove") |
|||
@Log(title = "合同类型", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{ids}") |
|||
public R<Void> remove(@NotEmpty(message = "主键不能为空") |
|||
@PathVariable Long[] ids) { |
|||
return toAjax(contractualTaskTypeService.deleteWithValidByIds(List.of(ids), true)); |
|||
} |
|||
} |
@ -0,0 +1,63 @@ |
|||
package org.dromara.productManagement.domain; |
|||
|
|||
import org.dromara.common.tenant.core.TenantEntity; |
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.io.Serial; |
|||
|
|||
/** |
|||
* 合同类型对象 contractual_task_type |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = true) |
|||
@TableName("contractual_task_type") |
|||
public class ContractualTaskType extends TenantEntity { |
|||
|
|||
@Serial |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 类型ID |
|||
*/ |
|||
@TableId(value = "id") |
|||
private Long id; |
|||
|
|||
/** |
|||
* 类型名称 |
|||
*/ |
|||
private String contractName; |
|||
|
|||
/** |
|||
* 显示顺序 |
|||
*/ |
|||
private Long sort; |
|||
|
|||
/** |
|||
* 状态(0正常 1停用) |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 删除标志(0代表存在 1代表删除) |
|||
*/ |
|||
@TableLogic |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 版本号 |
|||
*/ |
|||
@Version |
|||
private Long version; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remark; |
|||
|
|||
|
|||
} |
@ -0,0 +1,50 @@ |
|||
package org.dromara.productManagement.domain.bo; |
|||
|
|||
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 org.dromara.productManagement.domain.ContractualTaskType; |
|||
|
|||
/** |
|||
* 合同类型业务对象 |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = true) |
|||
@AutoMapper(target = ContractualTaskType.class, reverseConvertGenerate = false) |
|||
public class ContractualTaskTypeBo extends BaseEntity { |
|||
|
|||
/** |
|||
* 类型ID |
|||
*/ |
|||
@NotNull(message = "类型ID不能为空", groups = { EditGroup.class }) |
|||
private Long id; |
|||
|
|||
/** |
|||
* 类型名称 |
|||
*/ |
|||
@NotBlank(message = "类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) |
|||
private String contractName; |
|||
|
|||
/** |
|||
* 显示顺序 |
|||
*/ |
|||
private Long sort; |
|||
|
|||
/** |
|||
* 状态(0正常 1停用) |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remark; |
|||
|
|||
} |
@ -0,0 +1,72 @@ |
|||
package org.dromara.productManagement.domain.vo; |
|||
|
|||
import org.dromara.productManagement.domain.ContractualTaskType; |
|||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; |
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import org.dromara.common.excel.annotation.ExcelDictFormat; |
|||
import org.dromara.common.excel.convert.ExcelDictConvert; |
|||
import io.github.linpeilie.annotations.AutoMapper; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serial; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 合同类型视图对象 contractual_task_type |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
@Data |
|||
@ExcelIgnoreUnannotated |
|||
@AutoMapper(target = ContractualTaskType.class) |
|||
public class ContractualTaskTypeVo implements Serializable { |
|||
|
|||
@Serial |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 类型ID |
|||
*/ |
|||
@ExcelProperty(value = "类型ID") |
|||
private Long id; |
|||
|
|||
/** |
|||
* 类型名称 |
|||
*/ |
|||
@ExcelProperty(value = "类型名称") |
|||
private String contractName; |
|||
|
|||
/** |
|||
* 显示顺序 |
|||
*/ |
|||
@ExcelProperty(value = "显示顺序") |
|||
private Long sort; |
|||
|
|||
/** |
|||
* 状态(0正常 1停用) |
|||
*/ |
|||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class) |
|||
@ExcelDictFormat(readConverterExp = "0=正常,1=停用") |
|||
private String status; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
@ExcelProperty(value = "备注") |
|||
private String remark; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createTime; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updateTime; |
|||
|
|||
} |
@ -0,0 +1,15 @@ |
|||
package org.dromara.productManagement.mapper; |
|||
|
|||
import org.dromara.productManagement.domain.ContractualTaskType; |
|||
import org.dromara.productManagement.domain.vo.ContractualTaskTypeVo; |
|||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; |
|||
|
|||
/** |
|||
* 合同类型Mapper接口 |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
public interface ContractualTaskTypeMapper extends BaseMapperPlus<ContractualTaskType, ContractualTaskTypeVo> { |
|||
|
|||
} |
@ -0,0 +1,68 @@ |
|||
package org.dromara.productManagement.service; |
|||
|
|||
import org.dromara.productManagement.domain.vo.ContractualTaskTypeVo; |
|||
import org.dromara.productManagement.domain.bo.ContractualTaskTypeBo; |
|||
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 Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
public interface IContractualTaskTypeService { |
|||
|
|||
/** |
|||
* 查询合同类型 |
|||
* |
|||
* @param id 主键 |
|||
* @return 合同类型 |
|||
*/ |
|||
ContractualTaskTypeVo queryById(Long id); |
|||
|
|||
/** |
|||
* 分页查询合同类型列表 |
|||
* |
|||
* @param bo 查询条件 |
|||
* @param pageQuery 分页参数 |
|||
* @return 合同类型分页列表 |
|||
*/ |
|||
TableDataInfo<ContractualTaskTypeVo> queryPageList(ContractualTaskTypeBo bo, PageQuery pageQuery); |
|||
|
|||
/** |
|||
* 查询符合条件的合同类型列表 |
|||
* |
|||
* @param bo 查询条件 |
|||
* @return 合同类型列表 |
|||
*/ |
|||
List<ContractualTaskTypeVo> queryList(ContractualTaskTypeBo bo); |
|||
|
|||
/** |
|||
* 新增合同类型 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 是否新增成功 |
|||
*/ |
|||
Boolean insertByBo(ContractualTaskTypeBo bo); |
|||
|
|||
/** |
|||
* 修改合同类型 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 是否修改成功 |
|||
*/ |
|||
Boolean updateByBo(ContractualTaskTypeBo bo); |
|||
|
|||
/** |
|||
* 校验并批量删除合同类型信息 |
|||
* |
|||
* @param ids 待删除的主键集合 |
|||
* @param isValid 是否进行有效性校验 |
|||
* @return 是否删除成功 |
|||
*/ |
|||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid); |
|||
} |
@ -0,0 +1,150 @@ |
|||
package org.dromara.productManagement.service.impl; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.Collection; |
|||
|
|||
import org.dromara.common.core.utils.MapstructUtils; |
|||
import org.dromara.common.core.utils.StringUtils; |
|||
import org.springframework.stereotype.Service; |
|||
import lombok.RequiredArgsConstructor; |
|||
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|||
import org.dromara.common.mybatis.core.page.PageQuery; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|||
import org.dromara.productManagement.domain.bo.ContractualTaskTypeBo; |
|||
import org.dromara.productManagement.domain.vo.ContractualTaskTypeVo; |
|||
import org.dromara.productManagement.domain.ContractualTaskType; |
|||
import org.dromara.productManagement.mapper.ContractualTaskTypeMapper; |
|||
import org.dromara.productManagement.service.IContractualTaskTypeService; |
|||
import org.dromara.productManagement.mapper.ContractualTaskChecklistMapper; |
|||
|
|||
/** |
|||
* 合同类型Service业务层处理 |
|||
* |
|||
* @author Lion Li |
|||
* @date 2025-05-23 |
|||
*/ |
|||
@RequiredArgsConstructor |
|||
@Service |
|||
public class ContractualTaskTypeServiceImpl implements IContractualTaskTypeService { |
|||
|
|||
private final ContractualTaskTypeMapper baseMapper; |
|||
private final ContractualTaskChecklistMapper checklistMapper; |
|||
|
|||
/** |
|||
* 查询合同类型 |
|||
* |
|||
* @param id 合同类型主键 |
|||
* @return 合同类型 |
|||
*/ |
|||
@Override |
|||
public ContractualTaskTypeVo queryById(Long id) { |
|||
return baseMapper.selectVoById(id); |
|||
} |
|||
|
|||
/** |
|||
* 查询合同类型列表 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 合同类型 |
|||
*/ |
|||
@Override |
|||
public TableDataInfo<ContractualTaskTypeVo> queryPageList(ContractualTaskTypeBo bo, PageQuery pageQuery) { |
|||
LambdaQueryWrapper<ContractualTaskType> lqw = buildQueryWrapper(bo); |
|||
Page<ContractualTaskTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); |
|||
return TableDataInfo.build(result); |
|||
} |
|||
|
|||
/** |
|||
* 查询合同类型列表 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 合同类型 |
|||
*/ |
|||
@Override |
|||
public List<ContractualTaskTypeVo> queryList(ContractualTaskTypeBo bo) { |
|||
LambdaQueryWrapper<ContractualTaskType> lqw = buildQueryWrapper(bo); |
|||
return baseMapper.selectVoList(lqw); |
|||
} |
|||
|
|||
private LambdaQueryWrapper<ContractualTaskType> buildQueryWrapper(ContractualTaskTypeBo bo) { |
|||
Map<String, Object> params = bo.getParams(); |
|||
LambdaQueryWrapper<ContractualTaskType> lqw = Wrappers.lambdaQuery(); |
|||
lqw.like(StringUtils.isNotBlank(bo.getContractName()), ContractualTaskType::getContractName, bo.getContractName()); |
|||
lqw.eq(bo.getSort() != null, ContractualTaskType::getSort, bo.getSort()); |
|||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ContractualTaskType::getStatus, bo.getStatus()); |
|||
return lqw; |
|||
} |
|||
|
|||
/** |
|||
* 新增合同类型 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public Boolean insertByBo(ContractualTaskTypeBo bo) { |
|||
ContractualTaskType add = MapstructUtils.convert(bo, ContractualTaskType.class); |
|||
validEntityBeforeSave(add); |
|||
boolean flag = baseMapper.insert(add) > 0; |
|||
if (flag) { |
|||
bo.setId(add.getId()); |
|||
} |
|||
return flag; |
|||
} |
|||
|
|||
/** |
|||
* 修改合同类型 |
|||
* |
|||
* @param bo 合同类型 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public Boolean updateByBo(ContractualTaskTypeBo bo) { |
|||
ContractualTaskType update = MapstructUtils.convert(bo, ContractualTaskType.class); |
|||
validEntityBeforeSave(update); |
|||
return baseMapper.updateById(update) > 0; |
|||
} |
|||
|
|||
/** |
|||
* 保存前的数据校验 |
|||
* |
|||
* @param entity 实体类数据 |
|||
*/ |
|||
private void validEntityBeforeSave(ContractualTaskType entity) { |
|||
// 校验合同类型名称是否重复
|
|||
if (StringUtils.isNotEmpty(entity.getContractName())) { |
|||
LambdaQueryWrapper<ContractualTaskType> queryWrapper = Wrappers.lambdaQuery(); |
|||
queryWrapper.eq(ContractualTaskType::getContractName, entity.getContractName()); |
|||
if (entity.getId() != null) { |
|||
queryWrapper.ne(ContractualTaskType::getId, entity.getId()); |
|||
} |
|||
if (baseMapper.selectCount(queryWrapper) > 0) { |
|||
throw new RuntimeException("合同类型名称已存在"); |
|||
} |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* 批量删除合同类型 |
|||
* |
|||
* @param ids 需要删除的合同类型主键 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { |
|||
if (isValid) { |
|||
// 校验是否存在关联的合同审查要点
|
|||
for (Long id : ids) { |
|||
long count = checklistMapper.selectCountByTypeId(id); |
|||
if (count > 0) { |
|||
ContractualTaskTypeVo vo = baseMapper.selectVoById(id); |
|||
throw new RuntimeException("合同类型[" + vo.getContractName() + "]下存在审查要点,不能删除"); |
|||
} |
|||
} |
|||
} |
|||
return baseMapper.deleteBatchIds(ids) > 0; |
|||
} |
|||
} |
@ -0,0 +1,23 @@ |
|||
<?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.productManagement.mapper.ContractualTaskTypeMapper"> |
|||
|
|||
<resultMap type="org.dromara.productManagement.domain.ContractualTaskType" id="ContractualTaskTypeResult"> |
|||
<id property="id" column="id" /> |
|||
<result property="contractName" column="contract_name" /> |
|||
<result property="sort" column="sort" /> |
|||
<result property="status" column="status" /> |
|||
<result property="delFlag" column="del_flag" /> |
|||
<result property="version" column="version" /> |
|||
<result property="tenantId" column="tenant_id" /> |
|||
<result property="createDept" column="create_dept" /> |
|||
<result property="createBy" column="create_by" /> |
|||
<result property="createTime" column="create_time" /> |
|||
<result property="updateBy" column="update_by" /> |
|||
<result property="updateTime" column="update_time" /> |
|||
<result property="remark" column="remark" /> |
|||
</resultMap> |
|||
|
|||
</mapper> |
Loading…
Reference in new issue