From cbcdefb0f12172340315214a530acc1db4e66f05 Mon Sep 17 00:00:00 2001 From: YiLiLin Date: Wed, 7 Jun 2023 10:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/iep/qms/entity/QmsQcItem.java | 101 ++++++++++++++++++ .../controller/QmsInspecFreqController.java | 1 + .../qms/controller/QmsQcItemController.java | 97 +++++++++++++++++ .../iep/qms/service/QmsQcItemService.java | 13 +++ .../service/impl/QmsQcItemServiceImpl.java | 19 ++++ .../iep/qms/mapper/QmsQcItemMapper.java | 16 +++ .../resources/qms/mapper/QmsQcItemMapper.xml | 23 ++++ 7 files changed, 270 insertions(+) create mode 100644 qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java create mode 100644 qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java create mode 100644 qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcItemService.java create mode 100644 qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java create mode 100644 qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsQcItemMapper.java create mode 100644 qms-db/src/main/resources/qms/mapper/QmsQcItemMapper.xml diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java new file mode 100644 index 0000000..f17d1f0 --- /dev/null +++ b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java @@ -0,0 +1,101 @@ +package com.foreverwin.iep.qms.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; + +/** + * 检验项目表 + * + * @author mom code generator + * @date 2023-06-07 10:23:18 + */ +@Data +@TableName("qms_qc_item") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "检验项目表") +public class QmsQcItem extends Model { + + private static final long serialVersionUID = 1L; + public static final String KW_QMS_QC_ITEM_BO = "QmsQcItemBO"; + + + /** + * 主键 + */ + @TableId(type = IdType.INPUT) + @ApiModelProperty(value = "主键") + private String sid; + /** + * 生产点 + */ + @ApiModelProperty(value = "生产点") + private String site; + /** + * 检验项目编号 + */ + @ApiModelProperty(value = "检验项目编号") + private String qcItem; + /** + * 说明 + */ + @ApiModelProperty(value = "说明") + private String description; + /** + * 项目类型 + */ + @ApiModelProperty(value = "项目类型") + private String itemType; + /** + * 检验仪器类型 + */ + @ApiModelProperty(value = "检验仪器类型") + private String resourceType; + /** + * 检测说明 + */ + @ApiModelProperty(value = "检测说明") + private String qcDescription; + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private String status; + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + private String units; + /** + * 计量时写入 + */ + @ApiModelProperty(value = "计量时写入") + private String controlMode; + /** + * 建立人 + */ + @ApiModelProperty(value = "建立人") + private String createdUser; + /** + * 建立日期 + */ + @ApiModelProperty(value = "建立日期") + private LocalDateTime createdDateTime; + /** + * 修改人员 + */ + @ApiModelProperty(value = "修改人员") + private String modifiedUser; + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private LocalDateTime modifiedDateTime; +} diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecFreqController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecFreqController.java index f7e205b..2c3c86f 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecFreqController.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecFreqController.java @@ -38,6 +38,7 @@ public class QmsInspecFreqController { @GetMapping("/page") public R getQmsInspecFreqPage(Page page, QmsInspecFreq qmsInspecFreq) { return R.ok(qmsInspecFreqService.page(page, Wrappers.lambdaQuery(QmsInspecFreq.class) + .eq(QmsInspecFreq::getSite, TenantContextHolder.getTenantId()) .like(StrUtil.isNotBlank(qmsInspecFreq.getInspecNo()), QmsInspecFreq::getInspecNo, qmsInspecFreq.getInspecNo()) .orderByAsc(QmsInspecFreq::getInspecNo))); diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java new file mode 100644 index 0000000..383f228 --- /dev/null +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java @@ -0,0 +1,97 @@ +package com.foreverwin.iep.qms.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.foreverwin.iep.common.base.FrontPage; +import com.foreverwin.iep.qms.entity.QmsQcItem; +import com.foreverwin.iep.qms.service.QmsQcItemService; +import com.foreverwin.mom.common.core.util.R; +import com.foreverwin.mom.common.log.annotation.SysLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + + +/** + * 检验项目表l + * + * @author mom code generator + * @date 2023-06-07 10:23:18 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/qc-item") +@Api(value = "qc-item", tags = "检验项目表管理") +public class QmsQcItemController { + + private final QmsQcItemService qmsQcItemService; + + /** + * 分页查询 + * + * @param page 分页对象 + * @param qmsQcItem 检验项目表 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/page") + public R getQmsQcItemPage(FrontPage page, QmsQcItem qmsQcItem) { + return R.ok(qmsQcItemService.page(page, Wrappers.query())); + } + + + /** + * 通过id查询检验项目表 + * + * @param sid id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{sid}") + public R getById(@PathVariable("sid") String sid) { + return R.ok(qmsQcItemService.getById(sid)); + } + + /** + * 新增检验项目表 + * + * @param qmsQcItem 检验项目表 + * @return R + */ + @ApiOperation(value = "新增检验项目表", notes = "新增检验项目表") + @SysLog("新增检验项目表") + @PostMapping + @PreAuthorize("@pms.hasPermission('qms_qms_qc_item_save')") + public R save(@RequestBody QmsQcItem qmsQcItem) { + return R.ok(); + } + + /** + * 修改检验项目表 + * + * @param qmsQcItem 检验项目表 + * @return R + */ + @ApiOperation(value = "修改检验项目表", notes = "修改检验项目表") + @SysLog("修改检验项目表") + @PutMapping + @PreAuthorize("@pms.hasPermission('qms_qms_qc_item_save')") + public R updateById(@RequestBody QmsQcItem qmsQcItem) { + return R.ok(); + } + + /** + * 通过id删除检验项目表 + * + * @param sid id + * @return R + */ + @ApiOperation(value = "通过id删除检验项目表", notes = "通过id删除检验项目表") + @SysLog("通过id删除检验项目表") + @DeleteMapping("/{sid}") + @PreAuthorize("@pms.hasPermission('qms_qms_qc_item_del')") + public R removeById(@PathVariable String sid) { + return R.ok(qmsQcItemService.removeById(sid)); + } +} diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcItemService.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcItemService.java new file mode 100644 index 0000000..0c05e47 --- /dev/null +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcItemService.java @@ -0,0 +1,13 @@ +package com.foreverwin.iep.qms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.iep.qms.entity.QmsQcItem; + +/** + * 检验项目表 + * + * @author mom code generator + * @date 2023-06-07 10:23:18 + */ +public interface QmsQcItemService extends IService { +} diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java new file mode 100644 index 0000000..9a60691 --- /dev/null +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java @@ -0,0 +1,19 @@ +package com.foreverwin.iep.qms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.iep.qms.entity.QmsQcItem; +import com.foreverwin.iep.qms.mapper.QmsQcItemMapper; +import com.foreverwin.iep.qms.service.QmsQcItemService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 检验项目表 + * + * @author mom code generator + * @date 2023-06-07 10:23:18 + */ +@Service +@AllArgsConstructor +public class QmsQcItemServiceImpl extends ServiceImpl implements QmsQcItemService { +} diff --git a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsQcItemMapper.java b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsQcItemMapper.java new file mode 100644 index 0000000..b8d1c50 --- /dev/null +++ b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsQcItemMapper.java @@ -0,0 +1,16 @@ +package com.foreverwin.iep.qms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.iep.qms.entity.QmsQcItem; +import org.apache.ibatis.annotations.Mapper; + +/** + * 检验项目表 + * + * @author mom code generator + * @date 2023-06-07 10:23:18 + */ +@Mapper +public interface QmsQcItemMapper extends BaseMapper { + +} diff --git a/qms-db/src/main/resources/qms/mapper/QmsQcItemMapper.xml b/qms-db/src/main/resources/qms/mapper/QmsQcItemMapper.xml new file mode 100644 index 0000000..9fb0a6b --- /dev/null +++ b/qms-db/src/main/resources/qms/mapper/QmsQcItemMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + +