From 49e443c25a4f83768161a843229bf6ff9053bb94 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 20 八月 2025 15:59:44 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml | 4 +++-
multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlanMess.java | 5 ++++-
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java | 3 +++
multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlan.java | 7 +++++--
multi-system/src/main/resources/mapper/system/InspectionSpecificationMapper.xml | 4 +++-
multi-system/src/main/java/com/gkhy/exam/system/domain/PurchaseApplyPlan.java | 4 +++-
7 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
index afdce38..8a9d02a 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
@@ -1,5 +1,6 @@
package com.gkhy.exam.admin.controller.web;
+import com.gkhy.exam.common.annotation.RepeatSubmit;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.*;
import com.gkhy.exam.system.service.QualitySystemPlanService;
@@ -154,6 +155,7 @@
* @param qualitySystemPlan
* @return
*/
+ @RepeatSubmit
@ApiOperation(value = "质量体系策划新增")
@PostMapping("/insert")
public CommonResult insertQualitySystemPlan(@RequestBody QualitySystemPlan qualitySystemPlan){
@@ -165,6 +167,7 @@
* @param qualitySystemPlan
* @return
*/
+ @RepeatSubmit
@ApiOperation(value = "质量体系策划修改")
@PostMapping("/update")
public CommonResult updateQualitySystemPlan(@RequestBody QualitySystemPlan qualitySystemPlan){
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/PurchaseApplyPlan.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/PurchaseApplyPlan.java
index 5016160..1be4181 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/PurchaseApplyPlan.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/PurchaseApplyPlan.java
@@ -9,6 +9,7 @@
import lombok.Getter;
import lombok.Setter;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -22,7 +23,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "申请id")
+ @NotNull(message = "申请主键不可为空")
+ @ApiModelProperty(value = "申请id",required = true)
@TableField("apply_id")
private Integer applyId;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlan.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlan.java
index c000101..9224bec 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlan.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlan.java
@@ -9,6 +9,7 @@
import lombok.Getter;
import lombok.Setter;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
@@ -23,7 +24,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "企业ID")
+ @NotNull(message = "企业id不可为空")
+ @ApiModelProperty(value = "企业ID",required = true)
@TableField("company_id")
private Integer companyId;
@@ -31,7 +33,8 @@
@TableField(exist = false)
private String companyName;
- @ApiModelProperty(value = "年份")
+ @NotNull(message = "年份不可为空")
+ @ApiModelProperty(value = "年份",required = true)
@TableField("year")
private String year;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlanMess.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlanMess.java
index 6754f93..0d3670f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlanMess.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualitySystemPlanMess.java
@@ -8,7 +8,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.checkerframework.checker.units.qual.N;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -22,7 +24,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "策划id")
+ @NotNull(message = "策划主键不可为空")
+ @ApiModelProperty(value = "策划id",required = true)
@TableField("plan_id")
private Integer planId;
diff --git a/multi-system/src/main/resources/mapper/system/InspectionSpecificationMapper.xml b/multi-system/src/main/resources/mapper/system/InspectionSpecificationMapper.xml
index 70e2dbf..db5a8b8 100644
--- a/multi-system/src/main/resources/mapper/system/InspectionSpecificationMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/InspectionSpecificationMapper.xml
@@ -20,7 +20,9 @@
LEFT JOIN sys_company sc ON iss.company_id = sc.id
WHERE
iss.del_flag = 1
- AND iss.company_id = 24
+ <if test="companyId!=null">
+ AND iss.company_id = #{companyId}
+ </if>
ORDER BY
iss.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml b/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
index 373eba2..000e348 100644
--- a/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
@@ -28,7 +28,9 @@
LEFT JOIN sys_company sc ON pr.company_id = sc.id
WHERE
pr.del_flag = 1
- AND pr.company_id = 24
+ <if test="companyId!=null">
+ and pr.company_id = #{companyId}
+ </if>
ORDER BY
pr.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml b/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
index c7a6e30..a3836fa 100644
--- a/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
@@ -13,7 +13,7 @@
qsp.`check_id`,
su2.`name` as check_name,
qsp.`ratify_id`,
- su2.`name` as ratify_name,
+ su3.`name` as ratify_name,
qsp.`del_flag`,
qsp.`create_by`,
qsp.`create_time`,
--
Gitblit v1.9.2