Merge remote-tracking branch 'origin/master'
# Conflicts: # ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java # ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.javamaster
commit
eeebfdae3b
@ -0,0 +1,117 @@
|
||||
package org.dromara.qms.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.qms.domain.vo.QcInspectionMainFileRelationVo;
|
||||
import org.dromara.qms.domain.bo.QcInspectionMainFileRelationBo;
|
||||
import org.dromara.qms.service.IQcInspectionMainFileRelationService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 质检任务文件关系
|
||||
* 前端访问路由地址为:/qms/qcInspectionMainFileRelation
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/qcInspectionMainFileRelation")
|
||||
public class QcInspectionMainFileRelationController extends BaseController {
|
||||
|
||||
private final IQcInspectionMainFileRelationService qcInspectionMainFileRelationService;
|
||||
|
||||
/**
|
||||
* 查询质检任务文件关系列表
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<QcInspectionMainFileRelationVo> list(QcInspectionMainFileRelationBo bo, PageQuery pageQuery) {
|
||||
return qcInspectionMainFileRelationService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出质检任务文件关系列表
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:export")
|
||||
@Log(title = "质检任务文件关系", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(QcInspectionMainFileRelationBo bo, HttpServletResponse response) {
|
||||
List<QcInspectionMainFileRelationVo> list = qcInspectionMainFileRelationService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "质检任务文件关系", QcInspectionMainFileRelationVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取质检任务文件关系详细信息
|
||||
*
|
||||
* @param relationId 主键
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:query")
|
||||
@GetMapping("/{relationId}")
|
||||
public R<QcInspectionMainFileRelationVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relationId) {
|
||||
return R.ok(qcInspectionMainFileRelationService.queryById(relationId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检任务文件关系
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:add")
|
||||
@Log(title = "质检任务文件关系", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody QcInspectionMainFileRelationBo bo) {
|
||||
return toAjax(qcInspectionMainFileRelationService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检任务文件关系
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:edit")
|
||||
@Log(title = "质检任务文件关系", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody QcInspectionMainFileRelationBo bo) {
|
||||
return toAjax(qcInspectionMainFileRelationService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质检任务文件关系
|
||||
*
|
||||
* @param relationIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("qms:qcInspectionMainFileRelation:remove")
|
||||
@Log(title = "质检任务文件关系", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relationIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relationIds) {
|
||||
return toAjax(qcInspectionMainFileRelationService.deleteWithValidByIds(List.of(relationIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询质检任务文件关系列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getQcInspectionMainFileRelationList")
|
||||
public R<List<QcInspectionMainFileRelationVo>> getQcInspectionMainFileRelationList(QcInspectionMainFileRelationBo bo) {
|
||||
List<QcInspectionMainFileRelationVo> list = qcInspectionMainFileRelationService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package org.dromara.qms.domain.bo;
|
||||
|
||||
import org.dromara.qms.domain.QcInspectionMainFileRelation;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 质检任务文件关系业务对象 qc_inspection_main_file_relation
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = QcInspectionMainFileRelation.class, reverseConvertGenerate = false)
|
||||
public class QcInspectionMainFileRelationBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 质检主键
|
||||
*/
|
||||
@NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long relationId;
|
||||
|
||||
/**
|
||||
* 质检主键
|
||||
*/
|
||||
@NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long inspectionId;
|
||||
|
||||
/**
|
||||
* 文件主键
|
||||
*/
|
||||
@NotNull(message = "文件主键不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long ossId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package org.dromara.qms.domain.vo;
|
||||
|
||||
import org.dromara.qms.domain.QcInspectionMainFileRelation;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 质检任务文件关系视图对象 qc_inspection_main_file_relation
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = QcInspectionMainFileRelation.class)
|
||||
public class QcInspectionMainFileRelationVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 质检主键
|
||||
*/
|
||||
@ExcelProperty(value = "质检主键")
|
||||
private Long relationId;
|
||||
|
||||
/**
|
||||
* 质检主键
|
||||
*/
|
||||
@ExcelProperty(value = "质检主键")
|
||||
private Long inspectionId;
|
||||
|
||||
/**
|
||||
* 文件主键
|
||||
*/
|
||||
@ExcelProperty(value = "文件主键")
|
||||
private Long ossId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.qms.mapper;
|
||||
|
||||
import org.dromara.qms.domain.QcInspectionMainFileRelation;
|
||||
import org.dromara.qms.domain.vo.QcInspectionMainFileRelationVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 质检任务文件关系Mapper接口
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
public interface QcInspectionMainFileRelationMapper extends BaseMapperPlus<QcInspectionMainFileRelation, QcInspectionMainFileRelationVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.qms.service;
|
||||
|
||||
import org.dromara.qms.domain.QcInspectionMainFileRelation;
|
||||
import org.dromara.qms.domain.vo.QcInspectionMainFileRelationVo;
|
||||
import org.dromara.qms.domain.bo.QcInspectionMainFileRelationBo;
|
||||
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 zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
public interface IQcInspectionMainFileRelationService {
|
||||
|
||||
/**
|
||||
* 查询质检任务文件关系
|
||||
*
|
||||
* @param relationId 主键
|
||||
* @return 质检任务文件关系
|
||||
*/
|
||||
QcInspectionMainFileRelationVo queryById(Long relationId);
|
||||
|
||||
/**
|
||||
* 分页查询质检任务文件关系列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 质检任务文件关系分页列表
|
||||
*/
|
||||
TableDataInfo<QcInspectionMainFileRelationVo> queryPageList(QcInspectionMainFileRelationBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的质检任务文件关系列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 质检任务文件关系列表
|
||||
*/
|
||||
List<QcInspectionMainFileRelationVo> queryList(QcInspectionMainFileRelationBo bo);
|
||||
|
||||
/**
|
||||
* 新增质检任务文件关系
|
||||
*
|
||||
* @param bo 质检任务文件关系
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(QcInspectionMainFileRelationBo bo);
|
||||
|
||||
/**
|
||||
* 修改质检任务文件关系
|
||||
*
|
||||
* @param bo 质检任务文件关系
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(QcInspectionMainFileRelationBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除质检任务文件关系信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
package org.dromara.qms.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.qms.domain.bo.QcInspectionMainFileRelationBo;
|
||||
import org.dromara.qms.domain.vo.QcInspectionMainFileRelationVo;
|
||||
import org.dromara.qms.domain.QcInspectionMainFileRelation;
|
||||
import org.dromara.qms.mapper.QcInspectionMainFileRelationMapper;
|
||||
import org.dromara.qms.service.IQcInspectionMainFileRelationService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 质检任务文件关系Service业务层处理
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-07-31
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class QcInspectionMainFileRelationServiceImpl implements IQcInspectionMainFileRelationService {
|
||||
|
||||
private final QcInspectionMainFileRelationMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询质检任务文件关系
|
||||
*
|
||||
* @param relationId 主键
|
||||
* @return 质检任务文件关系
|
||||
*/
|
||||
@Override
|
||||
public QcInspectionMainFileRelationVo queryById(Long relationId){
|
||||
return baseMapper.selectVoById(relationId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询质检任务文件关系列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 质检任务文件关系分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<QcInspectionMainFileRelationVo> queryPageList(QcInspectionMainFileRelationBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<QcInspectionMainFileRelation> lqw = buildQueryWrapper(bo);
|
||||
Page<QcInspectionMainFileRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的质检任务文件关系列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 质检任务文件关系列表
|
||||
*/
|
||||
@Override
|
||||
public List<QcInspectionMainFileRelationVo> queryList(QcInspectionMainFileRelationBo bo) {
|
||||
MPJLambdaWrapper<QcInspectionMainFileRelation> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<QcInspectionMainFileRelation> buildQueryWrapper(QcInspectionMainFileRelationBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<QcInspectionMainFileRelation> lqw = JoinWrappers.lambda(QcInspectionMainFileRelation.class)
|
||||
.selectAll(QcInspectionMainFileRelation.class)
|
||||
.eq(bo.getRelationId() != null, QcInspectionMainFileRelation::getRelationId, bo.getRelationId())
|
||||
.eq(bo.getInspectionId() != null, QcInspectionMainFileRelation::getInspectionId, bo.getInspectionId())
|
||||
.eq(bo.getOssId() != null, QcInspectionMainFileRelation::getOssId, bo.getOssId())
|
||||
.orderByDesc(QcInspectionMainFileRelation::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检任务文件关系
|
||||
*
|
||||
* @param bo 质检任务文件关系
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(QcInspectionMainFileRelationBo bo) {
|
||||
QcInspectionMainFileRelation add = MapstructUtils.convert(bo, QcInspectionMainFileRelation.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setRelationId(add.getRelationId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检任务文件关系
|
||||
*
|
||||
* @param bo 质检任务文件关系
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(QcInspectionMainFileRelationBo bo) {
|
||||
QcInspectionMainFileRelation update = MapstructUtils.convert(bo, QcInspectionMainFileRelation.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(QcInspectionMainFileRelation 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,7 @@
|
||||
<?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.qms.mapper.QcInspectionMainFileRelationMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue