修改

“djh”

2 天以前 49e443c25a4f83768161a843229bf6ff9053bb94

修改

 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){

 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;


 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;


 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;


 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>

 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>

 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`,