From 6d5fc7859473d30a2e4c1f20f748abae652342b8 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 28 十一月 2025 13:11:26 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/ProcessInspectionService.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDocument.java | 8 ++++++--
multi-system/src/main/resources/mapper/system/ProjectDocumentMapper.xml | 8 +++++---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java | 2 +-
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ProcessInspectionController.java | 5 +++--
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProjectDocumentServiceImpl.java | 6 ++++--
multi-system/src/main/java/com/gkhy/exam/system/mapper/ProjectDocumentMapper.java | 3 ++-
multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/service/ProjectDocumentService.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProcessInspectionServiceImpl.java | 4 ++--
multi-system/src/main/java/com/gkhy/exam/system/mapper/ProcessInspectionMapper.java | 3 ++-
multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueProjectDocumentReq.java | 6 ++++++
12 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ProcessInspectionController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ProcessInspectionController.java
index c5d19f2..3e75722 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ProcessInspectionController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ProcessInspectionController.java
@@ -30,12 +30,13 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "companyId", dataType = "int", required = false, value = "公司iD"),
@ApiImplicitParam(paramType = "query", name = "type", dataType = "int", required = true, value = "类型1过程检验2最终检验"),
+ @ApiImplicitParam(paramType = "query", name = "itemId", dataType = "int", required = false, value = "项目iD"),
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = true, value = "页码"),
@ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = true, value = "每页数量")
})
@GetMapping("/inspection/list")
- public CommonResult selectProcessInspectionList(Integer companyId, @RequestParam("type") Integer templateType){
- return CommonResult.success(processInspectionService.selectProcessInspectionList(companyId, templateType));
+ public CommonResult selectProcessInspectionList(Integer companyId, @RequestParam("type") Integer templateType,Integer itemId){
+ return CommonResult.success(processInspectionService.selectProcessInspectionList(companyId, templateType, itemId));
}
/**
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
index e74e289..fe8c314 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
@@ -38,7 +38,7 @@
@TableField(value = "mess")
private String mess;
- @ApiModelProperty("目录名称 （1范围目录 2技术类 3项目类 4组织环境目录 5领导作业目录 6策划目录 7支持目录 8运行目录 9绩效评价目录 10改进目录）")
+ @ApiModelProperty("目录名称 （1范围目录 2技术类 3项目类 4组织环境目录 5领导作业目录 6策划目录 7支持目录 8运行目录 9绩效评价目录 10改进目录 11项目策划目录12生产过程目录13不合格品目录）")
@TableField(value = "type")
private Integer type;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDocument.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDocument.java
index 6b0de29..7470290 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDocument.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDocument.java
@@ -30,14 +30,18 @@
@TableField("item_id")
private Integer itemId;
- @ApiModelProperty(value = "项目id")
+ @ApiModelProperty(value = "附件名称")
@TableField("file_name")
private String fileName;
- @ApiModelProperty(value = "项目id")
+ @ApiModelProperty(value = "附件地址")
@TableField("file_path")
private String filePath;
+ @ApiModelProperty(value = "文档类型 3涉及开发过程11项目策划目录12生产过程目录13不合格品目录")
+ @TableField("document_type")
+ private Integer documentType;
+
private Integer del_flag;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueProjectDocumentReq.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueProjectDocumentReq.java
index 8992e2d..876fe4b 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueProjectDocumentReq.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueProjectDocumentReq.java
@@ -1,14 +1,20 @@
package com.gkhy.exam.system.domain.req;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.gkhy.exam.system.domain.ProjectDocument;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel(value = "CatalogueProjectDocumentReq",description = "项目文档")
public class CatalogueProjectDocumentReq {
private Integer companyId;
private Integer catalogueId;
private Integer itemId;
+ @ApiModelProperty(value = "文档类型3涉及开发过程11项目策划目录12生产过程目录13不合格品目录")
+ private Integer type;
private List<ProjectDocument> projectDocuments;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProcessInspectionMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProcessInspectionMapper.java
index f1b0d66..7ef42c5 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProcessInspectionMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProcessInspectionMapper.java
@@ -9,5 +9,6 @@
@Mapper
public interface ProcessInspectionMapper extends BaseMapper<ProcessInspection> {
- List<ProcessInspection> selectByCompanyidAndTypeList(@Param("companyId") Integer companyId, @Param("templateType") Integer templateType);
+ List<ProcessInspection> selectByCompanyidAndTypeList(@Param("companyId") Integer companyId, @Param("templateType") Integer templateType
+ , @Param("itemId") Integer itemId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProjectDocumentMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProjectDocumentMapper.java
index fc9c745..ea92f7f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProjectDocumentMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ProjectDocumentMapper.java
@@ -11,5 +11,6 @@
public interface ProjectDocumentMapper extends BaseMapper<ProjectDocument> {
Integer insertBaths(@Param("projectDocuments") List<ProjectDocument> projectDocuments);
- List<ProjectDocument> selectDocumentList(@Param("companyId") Integer companyId, @Param("itemId") Integer itemId, @Param("catalogueId") Integer catalogueId);
+ List<ProjectDocument> selectDocumentList(@Param("companyId") Integer companyId, @Param("itemId") Integer itemId,
+ @Param("catalogueId") Integer catalogueId,@Param("documentType") Integer documentType);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/ProcessInspectionService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/ProcessInspectionService.java
index 448d366..f484c59 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/ProcessInspectionService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/ProcessInspectionService.java
@@ -6,7 +6,7 @@
import com.gkhy.exam.system.domain.ProcessInspection;
public interface ProcessInspectionService extends IService<ProcessInspection> {
- CommonPage selectProcessInspectionList(Integer companyId, Integer templateType);
+ CommonPage selectProcessInspectionList(Integer companyId, Integer templateType,Integer itemId);
CommonResult insertProcessInspection(ProcessInspection processInspection);
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/ProjectDocumentService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/ProjectDocumentService.java
index 48d2886..7b2aca0 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/ProjectDocumentService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/ProjectDocumentService.java
@@ -10,7 +10,7 @@
public interface ProjectDocumentService extends IService<ProjectDocument> {
CommonResult insertprojectDocument(CatalogueProjectDocumentReq projectDocument);
- List<ProjectDocument> selectList(Integer companyId, Integer itemId, Integer catalogueId);
+ List<ProjectDocument> selectList(Integer companyId, Integer itemId, Integer catalogueId,Integer documentType);
CommonResult updateprojectDocument(CatalogueProjectDocumentReq projectDocument);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
index 40c4f0f..8d6b0a7 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
@@ -269,7 +269,7 @@
public CommonResult selectCatalogueDocumentList(CatalogueReq catalogueReq) {
List<CatalogueVo> catalogueVos = catalogueMapper.selectCatalogueList(catalogueReq);
for (CatalogueVo catalogueVo : catalogueVos) {
- List<ProjectDocument> projectDocuments = projectDocumentService.selectList(catalogueVo.getCompanyId(), catalogueReq.getItemId(), catalogueVo.getId());
+ List<ProjectDocument> projectDocuments = projectDocumentService.selectList(catalogueVo.getCompanyId(), catalogueReq.getItemId(), catalogueVo.getId(),catalogueReq.getType());
catalogueVo.setProjectDocuments(projectDocuments);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProcessInspectionServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProcessInspectionServiceImpl.java
index 3a2ead2..bfcb042 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProcessInspectionServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProcessInspectionServiceImpl.java
@@ -21,14 +21,14 @@
private ProcessInspectionMapper processInspectionMapper;
@Override
- public CommonPage selectProcessInspectionList(Integer companyId, Integer templateType) {
+ public CommonPage selectProcessInspectionList(Integer companyId, Integer templateType,Integer itemId) {
boolean admin = SecurityUtils.adminUser();
if (!admin){
if (companyId==null){
companyId = SecurityUtils.getCompanyId().intValue();
}
}
- List<ProcessInspection> processInspections = processInspectionMapper.selectByCompanyidAndTypeList(companyId, templateType);
+ List<ProcessInspection> processInspections = processInspectionMapper.selectByCompanyidAndTypeList(companyId, templateType, itemId);
return CommonPage.restPage(processInspections);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProjectDocumentServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProjectDocumentServiceImpl.java
index a4db4b6..12b034e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProjectDocumentServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ProjectDocumentServiceImpl.java
@@ -25,6 +25,7 @@
public CommonResult insertprojectDocument(CatalogueProjectDocumentReq projectDocument) {
List<ProjectDocument> projectDocuments = projectDocument.getProjectDocuments();
for (ProjectDocument document : projectDocuments) {
+ document.setDocumentType(projectDocument.getType());
document.setCompanyId(projectDocument.getCompanyId());
document.setCatalogueId(projectDocument.getCatalogueId());
document.setItemId(projectDocument.getItemId());
@@ -34,8 +35,8 @@
}
@Override
- public List<ProjectDocument> selectList(Integer companyId, Integer itemId, Integer catalogueId) {
- return projectDocumentMapper.selectDocumentList(companyId,itemId,catalogueId);
+ public List<ProjectDocument> selectList(Integer companyId, Integer itemId, Integer catalogueId,Integer documentType) {
+ return projectDocumentMapper.selectDocumentList(companyId,itemId,catalogueId,documentType);
}
@Override
@@ -50,6 +51,7 @@
}
List<ProjectDocument> projectDocuments = projectDocument.getProjectDocuments();
for (ProjectDocument document : projectDocuments) {
+ document.setDocumentType(projectDocument.getType());
document.setCompanyId(projectDocument.getCompanyId());
document.setCatalogueId(projectDocument.getCatalogueId());
document.setItemId(projectDocument.getItemId());
diff --git a/multi-system/src/main/resources/mapper/system/ProjectDocumentMapper.xml b/multi-system/src/main/resources/mapper/system/ProjectDocumentMapper.xml
index 6887d94..0e2409b 100644
--- a/multi-system/src/main/resources/mapper/system/ProjectDocumentMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ProjectDocumentMapper.xml
@@ -4,10 +4,10 @@
<insert id="insertBaths">
INSERT INTO `project_document`
- (`company_id`, `catalogue_id`, `item_id`, `file_name`, `file_path` )
+ (`company_id`, `catalogue_id`, `item_id`, `file_name`, `file_path`,document_type )
VALUES
<foreach collection="projectDocuments" separator="," item="item">
- ( #{item.companyId}, #{item.catalogueId}, #{item.itemId}, #{item.fileName}, #{item.filePath} )
+ ( #{item.companyId}, #{item.catalogueId}, #{item.itemId}, #{item.fileName}, #{item.filePath}, #{item.documentType} )
</foreach>
</insert>
@@ -19,12 +19,14 @@
`item_id`,
`file_name`,
`file_path`,
- `del_flag`
+ `del_flag`,
+ `document_type`
FROM
`project_document`
where del_flag = 1
and company_id = #{companyId}
and catalogue_id = #{catalogueId}
and item_id = #{itemId}
+ and document_type = #{documentType}
</select>
</mapper>
--
Gitblit v1.9.2