From b18165f30f764eb6be88128402a31d91999d498e Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 8 Jun 2023 09:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AA=A2=E9=A9=97=E8=A8=88?= =?UTF-8?q?=E7=95=AB=20ISQC=20ROUTER=E9=96=8B=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iep/qms/entity/QmsVwRouterCustom.java | 101 ++++++++++++++++++ .../qms/controller/QmsQcPlanController.java | 22 ++++ .../iep/qms/service/QmsQcPlanService.java | 3 + .../qms/service/QmsVwRouterCustomService.java | 14 +++ .../service/impl/QmsQcPlanServiceImpl.java | 9 ++ .../impl/QmsVwRouterCustomServiceImpl.java | 18 ++++ .../qms/mapper/QmsVwRouterCustomMapper.java | 16 +++ .../qms/mapper/QmsVwRouterCustomMapper.xml | 0 8 files changed, 183 insertions(+) create mode 100644 qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsVwRouterCustom.java create mode 100644 qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsVwRouterCustomService.java create mode 100644 qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsVwRouterCustomServiceImpl.java create mode 100644 qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsVwRouterCustomMapper.java create mode 100644 qms-db/src/main/resources/qms/mapper/QmsVwRouterCustomMapper.xml diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsVwRouterCustom.java b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsVwRouterCustom.java new file mode 100644 index 0000000..23e0dac --- /dev/null +++ b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsVwRouterCustom.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.io.Serializable; +import java.time.LocalDateTime; + +/** + * VIEW + * + * @author mom code generator + * @date 2023-06-08 09:09:34 + */ +@Data +@TableName("qms_vw_router_custom") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "VIEW") +public class QmsVwRouterCustom extends Model { + + private static final long serialVersionUID = 1L; + + /** + * handle + */ + @ApiModelProperty(value="handle") + private String handle; + + /** + * site + */ + @ApiModelProperty(value="site") + private String site; + + /** + * router + */ + @ApiModelProperty(value="router") + private String router; + + /** + * routerType + */ + @ApiModelProperty(value="routerType") + private String routerType; + + /** + * description + */ + @ApiModelProperty(value="description") + private String description; + + /** + * statusBo + */ + @ApiModelProperty(value="statusBo") + private String statusBo; + + /** + * revision + */ + @ApiModelProperty(value="revision") + private String revision; + + /** + * currentRevision + */ + @ApiModelProperty(value="currentRevision") + private String currentRevision; + + /** + * originalStatusBo + */ + @ApiModelProperty(value="originalStatusBo") + private String originalStatusBo; + + /** + * holdId + */ + @ApiModelProperty(value="holdId") + private String holdId; + + /** + * fieldName + */ + @ApiModelProperty(value="fieldName") + private String fieldName; + + /** + * fieldValue + */ + @ApiModelProperty(value="fieldValue") + private String fieldValue; + +} diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcPlanController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcPlanController.java index 48ad239..27bad97 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcPlanController.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcPlanController.java @@ -102,4 +102,26 @@ public class QmsQcPlanController { return R.ok(); } + /** + * 新增检验计划 + * @param qmsQcPlan 检验计划 + * @return R + */ + @ApiOperation(value = "新增检验计划", notes = "新增检验计划") + @SysLog("新增检验计划" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('qms_insp_plan_import')" ) + public R qcPlanImport(@RequestBody List qmsQcPlanList) { + return R.ok(qmsQcPlanService.qcPlanImport(qmsQcPlanList)); + } + + /** + * 通过id查询检验计划 + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/qc/router" ) + public R getQcRouter(@PathVariable("qcPlan" ) String qcPlan, @PathVariable("revision" ) String revision) { + return R.ok(qmsQcPlanService.findQCPlan(TenantContextHolder.getTenantId(), qcPlan, revision)); + } } diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcPlanService.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcPlanService.java index 641ad39..f63cde7 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcPlanService.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsQcPlanService.java @@ -2,6 +2,7 @@ package com.foreverwin.iep.qms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.iep.qms.entity.QmsQcPlan; +import com.foreverwin.iep.qms.entity.QmsVwRouterCustom; import java.util.List; @@ -22,4 +23,6 @@ public interface QmsQcPlanService extends IService { void deleteQCPlan( String site, String qcPlan, String revision ); List qcPlanImport( List qcPlanList ); + + List getQcRouter( String site ); } diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsVwRouterCustomService.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsVwRouterCustomService.java new file mode 100644 index 0000000..9e3d638 --- /dev/null +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsVwRouterCustomService.java @@ -0,0 +1,14 @@ +package com.foreverwin.iep.qms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.iep.qms.entity.QmsVwRouterCustom; + +/** + * VIEW + * + * @author mom code generator + * @date 2023-06-08 09:09:34 + */ +public interface QmsVwRouterCustomService extends IService { + +} diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java index 4cb67c9..0d08a53 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java @@ -51,6 +51,7 @@ public class QmsQcPlanServiceImpl extends ServiceImpl getQcRouter( String site ) { + return qmsVwRouterCustomService.list(Wrappers.lambdaQuery() + .eq(QmsVwRouterCustom::getSite, site) + .eq(QmsVwRouterCustom::getFieldName, "ISQC") + .eq(QmsVwRouterCustom::getFieldValue, "Y")); + } + private QmsQcPlan findCurrQc( String site, String qcPlan ){ return super.getOne(Wrappers.lambdaQuery() .eq(QmsQcPlan::getSite, site) diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsVwRouterCustomServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsVwRouterCustomServiceImpl.java new file mode 100644 index 0000000..4dd2bf8 --- /dev/null +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsVwRouterCustomServiceImpl.java @@ -0,0 +1,18 @@ +package com.foreverwin.iep.qms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.iep.qms.entity.QmsVwRouterCustom; +import com.foreverwin.iep.qms.mapper.QmsVwRouterCustomMapper; +import com.foreverwin.iep.qms.service.QmsVwRouterCustomService; +import org.springframework.stereotype.Service; + +/** + * VIEW + * + * @author mom code generator + * @date 2023-06-08 09:09:34 + */ +@Service +public class QmsVwRouterCustomServiceImpl extends ServiceImpl implements QmsVwRouterCustomService { + +} diff --git a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsVwRouterCustomMapper.java b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsVwRouterCustomMapper.java new file mode 100644 index 0000000..ef0d588 --- /dev/null +++ b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsVwRouterCustomMapper.java @@ -0,0 +1,16 @@ +package com.foreverwin.iep.qms.mapper; + +import com.foreverwin.mom.common.data.datascope.MomBaseMapper; +import com.foreverwin.iep.qms.entity.QmsVwRouterCustom; +import org.apache.ibatis.annotations.Mapper; + +/** + * VIEW + * + * @author mom code generator + * @date 2023-06-08 09:09:34 + */ +@Mapper +public interface QmsVwRouterCustomMapper extends MomBaseMapper { + +} diff --git a/qms-db/src/main/resources/qms/mapper/QmsVwRouterCustomMapper.xml b/qms-db/src/main/resources/qms/mapper/QmsVwRouterCustomMapper.xml new file mode 100644 index 0000000..e69de29