multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java

@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjectUtil;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.domain.TreeSelect;
import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.system.domain.SysFunctionalDistribution;
import com.gkhy.exam.system.domain.vo.DeptVo;
@@ -54,6 +55,15 @@
    }


    @GetMapping("/treeList")
    @ApiOperation(value = "获取部门列表树状")
    public CommonResult treeList(SysDept dept)
    {
        List<TreeSelect> treeSelects = deptService.selectDeptTreeList(dept);
        return CommonResult.success(treeSelects);
    }




    /**

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysIndustryTypeController.java

对比新文件
@@ -0,0 +1,73 @@
package com.gkhy.exam.admin.controller.system;

import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyBasic;
import com.gkhy.exam.system.domain.CompanyIndustryType;
import com.gkhy.exam.system.service.SysIndustryTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@Api(tags = "行业模版")
@RestController
@RequestMapping("/system/industry/type")
public class SysIndustryTypeController{
    @Autowired
    private SysIndustryTypeService service;

    /**
     * 行业类型列表
     * @return
     */
    @ApiOperation(value = "行业类型列表")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
            @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10")
    })
    @GetMapping("/list")
    public CommonResult listIndustryType(){
        return CommonResult.success(service.selectIndustryTypeList());
    }

    @GetMapping("/listAll")
    public CommonResult listIndustryTypeAll(){
        return CommonResult.success(service.selectList());
    }

    /**
     * 行业类型新增
     * @param companyIndustryType
     * @return
     */
    @ApiOperation(value = "行业类型新增")
    @PostMapping("/insert")
    public CommonResult insertIndustryType(@RequestBody CompanyIndustryType companyIndustryType){
        return service.insertIndustryType(companyIndustryType);
    }

    /**
     * 行业类型修改
     * @param companyIndustryType
     * @return
     */
    @ApiOperation(value = "行业类型修改")
    @PostMapping("/update")
    public CommonResult updateIndustryType(@RequestBody CompanyIndustryType companyIndustryType){
        return service.updateIndustryType(companyIndustryType);
    }

    /**
     * 行业类型删除
     * @param IndustryId
     * @return
     */
    @ApiOperation(value = "行业类型删除")
    @GetMapping("/deleted")
    public CommonResult deletedIndustryType(@RequestParam("IndustryId") Integer IndustryId){
        return service.deletedIndustryType(IndustryId);
    }

}

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/WordExportController.java

对比新文件
@@ -0,0 +1,62 @@
//package com.gkhy.exam.admin.controller.system;
//
//
//import org.apache.poi.poifs.filesystem.DirectoryEntry;
//import org.apache.poi.poifs.filesystem.DocumentEntry;
//import org.apache.poi.poifs.filesystem.POIFSFileSystem;
//import org.springframework.core.io.ClassPathResource;
//import org.springframework.http.HttpHeaders;
//import org.springframework.http.MediaType;
//import org.springframework.http.ResponseEntity;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.ServletOutputStream;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.*;
//import java.util.Map;
//
//@RestController
//public class WordExportController {
//    @ResponseBody
//    @RequestMapping(value = "download")
//    public int download(HttpServletResponse response, HttpServletRequest request)throws Exception {
//        String content = "<h1>标题头</h1><h2>第二个标题</h2><a href=\"www.baidu.com\">百度搜索</a>";
//        StringBuffer sbf = new StringBuffer();
//        sbf.append("<html><body>");
//        sbf.append(content);
//        sbf.append("</body></html");
//        exportWord(request,response,String.valueOf(sbf),"word1");
//        return 1;
//    }
//
//
//    /**
//     *
//     * @param request
//     * @param response
//     * @param content  富文本内容
//     * @param fileName 生成word名字
//     * @throws Exception
//     */
//    public static void exportWord(HttpServletRequest request, HttpServletResponse response, String content, String fileName) throws Exception {
//        byte b[] = content.getBytes("GBK"); //这里是必须要设置编码的，不然导出中文就会乱码。
//        ByteArrayInputStream bais = new ByteArrayInputStream(b);//将字节数组包装到流中
//        POIFSFileSystem poifs = new POIFSFileSystem();
//        DirectoryEntry directory = poifs.getRoot();
//        DocumentEntry documentEntry = directory.createDocument("WordDocument", bais); //该步骤不可省略，否则会出现乱码。
//        //输出文件
//        request.setCharacterEncoding("utf-8");
//        response.setContentType("application/msword");//导出word格式
//        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"),"iso8859-1") + ".doc");
//        ServletOutputStream ostream = response.getOutputStream();
//        poifs.writeFilesystem(ostream);
//        bais.close();
//        ostream.close();
//        poifs.close();
//    }
//
//
//
//
//}

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/CompanyBasicController.java

@@ -280,7 +280,7 @@

    /**
     * 行业模版
     * @param companyId
     * @param companyIndustryTemplate
     * @return
     */
    @ApiOperation(value = "行业模版(分页)")
@@ -289,8 +289,8 @@
            @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
    })
    @GetMapping("/industryTemplate/list")
    public CommonResult selectCompanyIndustryTemplateList(Integer companyId){
        return CommonResult.success(companyIndustryTemplateService.selectCompanyIndustryTemplateList(companyId));
    public CommonResult selectCompanyIndustryTemplateList(CompanyIndustryTemplate companyIndustryTemplate){
        return CommonResult.success(companyIndustryTemplateService.selectCompanyIndustryTemplateList(companyIndustryTemplate));
    }

    /**

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java

@@ -1,17 +1,9 @@
package com.gkhy.exam.admin.controller.web;

import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyQualityPolicy;
import com.gkhy.exam.system.domain.Quality;
import com.gkhy.exam.system.domain.QualityAccomplish;
import com.gkhy.exam.system.domain.QualityDecompose;
import com.gkhy.exam.system.domain.req.DecomposeTargetReq;
import com.gkhy.exam.system.domain.req.QualityReq;
import com.gkhy.exam.system.domain.req.QualityTargetReq;
import com.gkhy.exam.system.service.QualityAccomplishService;
import com.gkhy.exam.system.service.QualityDecomposeService;
import com.gkhy.exam.system.service.QualityService;
import com.gkhy.exam.system.service.QualityTargetService;
import com.gkhy.exam.system.domain.*;
import com.gkhy.exam.system.domain.req.*;
import com.gkhy.exam.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -35,6 +27,9 @@

    @Autowired
    private QualityDecomposeService qualityDecomposeService;

    @Autowired
    private CatalogueService catalogueService;


    /**
@@ -199,4 +194,143 @@
    }


    /**
     * 质量管理体系运行列表
     * @param catalogueReq
     * @return
     */
    @ApiOperation(value = "质量管理体系运行列表")
    @GetMapping("/catalogue/list")
    public CommonResult listCatalogue(CatalogueReq catalogueReq){
        return CommonResult.success(catalogueService.selectCatalogueList(catalogueReq));
    }


    /**
     * 质量管理体系运行新增
     * @param catalogue
     * @return
     */
    @ApiOperation(value = "质量管理体系运行新增")
    @PostMapping("/catalogue/insert")
    public CommonResult insertCatalogue(@RequestBody Catalogue catalogue){
        return catalogueService.insertCatalogue(catalogue);
    }

    /**
     * 质量管理体系运行修改
     * @param catalogue
     * @return
     */
    @ApiOperation(value = "质量管理体系运行修改")
    @PostMapping("/catalogue/update")
    public CommonResult updateCatalogue(@RequestBody Catalogue catalogue){
        return catalogueService.updateCatalogue(catalogue);
    }

    /**
     * 质量管理体系运行删除
     * @param catalogueId
     * @return
     */
    @ApiOperation(value = "质量管理体系运行删除")
    @GetMapping("/catalogue/deleted")
    public CommonResult deletedCatalogue(@RequestParam("catalogueId") Integer catalogueId){
        return catalogueService.deletedCatalogue(catalogueId);
    }



    /**
     * 目录数据列表
     * @param catalogueReq
     * @return
     */
    @ApiOperation(value = "目录数据列表")
    @GetMapping("/catalogueData/list")
    public CommonResult listCatalogueData(CatalogueReq catalogueReq){
        return CommonResult.success(catalogueService.selectCatalogueDataList(catalogueReq));
    }


    /**
     * 目录数据新增
     * @param catalogue
     * @return
     */
    @ApiOperation(value = "目录数据新增")
    @PostMapping("/catalogueData/insert")
    public CommonResult insertCatalogueData(@RequestBody CatalogueDataReq catalogue){
        return catalogueService.insertCatalogueData(catalogue);
    }

    /**
     * 目录数据修改
     * @param catalogue
     * @return
     */
    @ApiOperation(value = "目录数据修改")
    @PostMapping("/catalogueData/update")
    public CommonResult updateCatalogueData(@RequestBody CatalogueDataReq catalogue){
        return catalogueService.updateCatalogueData(catalogue);
    }

    /**
     * 目录数据删除
     * @param catalogueDataId
     * @return
     */
    @ApiOperation(value = "目录数据删除")
    @GetMapping("/catalogueData/deleted")
    public CommonResult deletedCatalogueData(@RequestParam("catalogueDataId") Integer catalogueDataId){
        return catalogueService.deletedCatalogueData(catalogueDataId);
    }
//
//    /**
//     * 目录数据文件列表
//     * @param catalogueReq
//     * @return
//     */
//    @ApiOperation(value = "目录数据文件列表")
//    @GetMapping("/catalogueData/list")
//    public CommonResult listCatalogueDataFile(CatalogueReq catalogueReq){
//        return CommonResult.success(catalogueService.selectCatalogueDataList(catalogueReq));
//    }


    /**
     * 目录数据文件新增
     * @param catalogueDataFile
     * @return
     */
    @ApiOperation(value = "目录数据文件新增")
    @PostMapping("/catalogueDataFile/insert")
    public CommonResult insertCatalogueDataFile(@RequestBody CatalogueDataFile catalogueDataFile){
        return catalogueService.insertCatalogueDataFile(catalogueDataFile);
    }

    /**
     * 目录数据文件修改
     * @param catalogueDataFile
     * @return
     */
    @ApiOperation(value = "目录数据文件修改")
    @PostMapping("/catalogueDataFile/update")
    public CommonResult updateCatalogueDataFile(@RequestBody CatalogueDataFile catalogueDataFile){
        return catalogueService.updateCatalogueDataFile(catalogueDataFile);
    }

    /**
     * 目录数据文件删除
     * @param dataFileId
     * @return
     */
    @ApiOperation(value = "目录数据文件删除")
    @GetMapping("/catalogueDataFile/deleted")
    public CommonResult deletedCatalogueDataFile(@RequestParam("dataFileId") Integer dataFileId){
        return catalogueService.deletedCatalogueDataFile(dataFileId);
    }



}

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java

对比新文件
@@ -0,0 +1,132 @@
package com.gkhy.exam.admin.controller.web;

import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyIndustryTemplate;
import com.gkhy.exam.system.domain.StandardizedQuality;
import com.gkhy.exam.system.domain.StandardizedTemplate;
import com.gkhy.exam.system.service.StandardizedTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@Api(tags = "标准化体系模板")
@RestController
@RequestMapping("/template")
public class TemplateController {


    @Autowired
    private StandardizedTemplateService standardizedTemplateService;

    /**
     * 行业模版
     * @param companyId
     * @return
     */
    @ApiOperation(value = "标准化模版(分页)")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "int", required = false, value = "公司iD"),
            @ApiImplicitParam(paramType = "query", name = "templateType", dataType = "int", required = true, value = "类型1体系标准2技术标准3应用标准4程序文件5作业指导书6记录及表单7技术类8生产类9其他知识产权"),
            @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = true, value = "页码"),
            @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = true, value = "每页数量")
    })
    @GetMapping("/standardizedTemplate/list")
    public CommonResult selectStandardizedTemplateList(Integer companyId, @RequestParam("templateType") Integer templateType){
        return CommonResult.success(standardizedTemplateService.selectStandardizedTemplateList(companyId, templateType));
    }

    /**
     * 行业模版新增
     * @param standardizedTemplate
     * @return
     */
    @ApiOperation(value = "标准化模版新增")
    @PostMapping("/standardizedTemplate/insert")
    public CommonResult insertStandardizedTemplate(@Validated @RequestBody StandardizedTemplate standardizedTemplate){
        return standardizedTemplateService.insertStandardizedTemplate(standardizedTemplate);
    }

    /**
     * 企业花名册修改
     * @param standardizedTemplate
     * @return
     */
    @ApiOperation(value = "标准化模版修改")
    @PostMapping("/standardizedTemplate/update")
    public CommonResult updateCompanyIndustryTemplate(@Validated @RequestBody StandardizedTemplate standardizedTemplate){
        return standardizedTemplateService.updateStandardizedTemplate(standardizedTemplate);
    }

    /**
     * 行业模版删除
     * @param standardizedTemplateId
     * @return
     */
    @ApiOperation(value = "标准化模版删除")
    @GetMapping("/standardizedTemplate/deleted")
    public CommonResult deletedStandardizedTemplate(@RequestParam("standardizedTemplateId") Integer standardizedTemplateId){
        return standardizedTemplateService.deletedStandardizedTemplate(standardizedTemplateId);
    }

    /**
     * 行业模版
     * @param companyId
     * @return
     */
    @ApiOperation(value = "获取质量手册")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "int", required = true, value = "公司iD"),
    })
    @GetMapping("/standardizedQuality/info")
    public CommonResult selectStandardizedQuality(Integer companyId){
        return CommonResult.success(standardizedTemplateService.selectStandardizedQuality(companyId));
    }

    /**
     * 行业模版新增
     * @param standardizedQuality
     * @return
     */
    @ApiOperation(value = "质量手册新增")
    @PostMapping("/standardizedQuality/insert")
    public CommonResult insertStandardizedQuality(@Validated @RequestBody StandardizedQuality standardizedQuality){
        return standardizedTemplateService.insertStandardizedQuality(standardizedQuality);
    }

    /**
     * 企业花名册修改
     * @param standardizedQuality
     * @return
     */
    @ApiOperation(value = "质量手册修改")
    @PostMapping("/standardizedQuality/update")
    public CommonResult updateStandardizedQuality(@Validated @RequestBody StandardizedQuality standardizedQuality){
        return standardizedTemplateService.updateStandardizedQuality(standardizedQuality);
    }

    /**
     * 行业模版删除
     * @param standardizedQualityId
     * @return
     */
    @ApiOperation(value = "质量手册删除")
    @GetMapping("/standardizedQuality/deleted")
    public CommonResult deletedStandardizedQuality(@RequestParam("standardizedQualityId") Integer standardizedQualityId){
        return standardizedTemplateService.deletedStandardizedQuality(standardizedQualityId);
    }

    /**
     * 获取质量手册数据
     * @param companyId
     * @return
     */
    @ApiOperation(value = "获取质量手册数据")
    @GetMapping("/standardizedQuality/dataInfo")
    public CommonResult standardizedQualityDataInfo(@RequestParam("companyId") Integer companyId){
        return standardizedTemplateService.getStandardizedQualityByCompanyId(companyId);
    }
}

 multi-admin/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://127.0.0.1:23306/train_exam?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Beijing&useSSL=false&allowPublicKeyRetrieval=true&allowMultiQueries=true
        url: jdbc:mysql://127.0.0.1:7006/multi_system?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&allowMultiQueries=true
        username: root
        password: 2farwL3yPXfbH2AP
      # 从库数据源
@@ -41,10 +41,10 @@
        login-password: druid
  #redis 配置
  redis:
    database: 0
    database: 5
    host: 127.0.0.1
    port: 6379
    password:
    password: akj78avauba789a


# mybatis-plus相关配置
@@ -80,7 +80,7 @@
  enabled: false

minio:
  endpoint: http://127.0.0.1:9000/ #Minio服务所在地址
  bucketName: trainexam #存储桶名称
  accessKey: nblxqRZXDvQ59HBH49rF #访问的key
  secretKey: TR0IFphXPo0IObQCYgcJ0JOik21s40ey2MIMU8Rh #访问的秘钥
  endpoint: http://106.15.95.149:9001/ #Minio服务所在地址
  bucketName: multiSystem #存储桶名称
  accessKey: U9JW4xOeeUQOSR4f #访问的key
  secretKey: iaqQV6twR9yDZiFAf2UYr5xZfESanZs3 #访问的秘钥

 multi-admin/src/main/resources/application.yml

@@ -1,8 +1,8 @@
spring:
  application:
    name: train_exam
    name: multi_system
  profiles:
    active: dev
    active: prod
  servlet:
    multipart:
      enabled: true
@@ -15,7 +15,7 @@
      matching-strategy: ant_path_matcher

server:
  port: 8082
  port: 8056
  servlet:
    context-path: /api
  tomcat:

 multi-admin/src/test/java/com/gkhy/exam/admin/ExcelTest.java

@@ -19,6 +19,6 @@

    @Test
    public void importTest(){
        commonService.importStudent();
     //   commonService.importStudent();
    }
}

 multi-common/pom.xml

@@ -152,6 +152,30 @@
            <artifactId>easyexcel</artifactId>
        </dependency>

<!--        <dependency>-->
<!--            <groupId>com.deepoove</groupId>-->
<!--            <artifactId>poi-tl</artifactId>-->
<!--        </dependency>-->

<!--        &lt;!&ndash; 如果需要解析HTML &ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>org.jsoup</groupId>-->
<!--            <artifactId>jsoup</artifactId>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>com.itextpdf</groupId>-->
<!--            <artifactId>itextpdf</artifactId>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>org.bouncycastle</groupId>-->
<!--            <artifactId>bcprov-jdk15on</artifactId>-->
<!--        </dependency>-->
<!--        &lt;!&ndash; 支持中文 &ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>com.itextpdf</groupId>-->
<!--            <artifactId>itext-asian</artifactId>-->
<!--        </dependency>-->

    </dependencies>

</project>

 multi-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java

@@ -20,8 +20,8 @@
    @Bean
    public FFmpeg fFmpeg() {
        String path = System.getProperty("user.dir");
        if(path.endsWith("exam-admin")){
            path=path.replace("\\exam-admin","");
        if(path.endsWith("multi-admin")){
            path=path.replace("\\multi-admin","");
        }
        if (isLinux()){
            path+="/ffmpeg/ffmpeg-linux/ffmpeg";

 multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java

@@ -56,10 +56,10 @@
    @TableField("user_type")
    private Integer userType;

    @NotBlank(message = "手机号码不能为空")
    @Length(min = 11, max = 11, message = "手机号只能为11位")
    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
    @ApiModelProperty(value = "手机号码",required = true)
//    @NotBlank(message = "手机号码不能为空")
//    @Length(min = 11, max = 11, message = "手机号只能为11位")
//    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
    @ApiModelProperty(value = "手机号码",required = false)
    @TableField("phone")
    private String phone;


 multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java

对比新文件
@@ -0,0 +1,55 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDate;
@Getter
@Setter
@TableName("catalogue")
@ApiModel(value = "catalogue",description = "质量管理体系运行目录")
public class Catalogue implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("序号")
    @TableField(value = "number")
    private String  number;

    @ApiModelProperty("上级目录id")
    @TableField(value = "parent_id")
    private Integer parentId;

    @ApiModelProperty("目录名称")
    @TableField(value = "mess")
    private String mess;

    @ApiModelProperty("目录名称 （1范围目录 2规范性引用目录 3术语与定义目录  4组织环境目录  5领导作业目录  6策划目录  7支持目录  8运行目录  9绩效评价目录  10改进目录）")
    @TableField(value = "type")
    private Integer type;

    @TableField(value = "del_flag")
    private Integer delFlag;

    @TableField(value = "create_by")
    private String createBy;

    @TableField(value = "create_time")
    private LocalDate createTime;

    @TableField(value = "update_by")
    private String updateBy;

    @TableField(value = "update_time")
    private LocalDate updateTime;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/CatalogueData.java

对比新文件
@@ -0,0 +1,67 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;

@Data
@TableName("catalogue_data")
@ApiModel(value = "catalogue_data",description = "质量管理体系运行目录数据")
public class CatalogueData implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableField(value = "catalogue_id")
    private Integer catalogueId;
    @TableField(value = "company_id")
    private Integer companyId;
    @TableField(value = "content")
    private String content;
    @TableField(value = "analysis")
    private String analysis;
    @TableField(value = "del_flag")
    private Integer delFlag;
    @TableField(value = "create_by")
    private String createBy;
    @TableField(value = "create_time")
    private LocalDate createTime;
    @TableField(value = "update_by")
    private String updateBy;
    @TableField(value = "updateTime")
    private LocalDate updateTime;


























}

 multi-system/src/main/java/com/gkhy/exam/system/domain/CatalogueDataFile.java

对比新文件
@@ -0,0 +1,60 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDate;

@Data
@TableName("catalogue_data_file")
@ApiModel(value = "catalogue_data_file",description = "质量管理体系运行目录")
public class CatalogueDataFile implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @TableField(value = "catalogue_data_id")
    private Integer catalogueDataId;

    @TableField(value = "company_id")
    private Integer companyId;
    @TableField(value = "catalogue_id")
    private Integer catalogueId;

    @TableField(value = "name")
    private String name;

    @TableField(value = "file_path")
    private String filePath;
    @TableField(value = "file_name")
    private String fileName;

    @TableField(value = "type")
    private Integer type;

    @TableField(value = "del_flag")
    private Integer delFlag;

    @TableField(value = "create_by")
    private String createBy;

    @TableField(value = "create_time")
    private LocalDate createTime;

    @TableField(value = "update_by")
    private String updateBy;

    @TableField(value = "update_time")
    private LocalDate updateTime;




}

 multi-system/src/main/java/com/gkhy/exam/system/domain/CompanyIndustryTemplate.java

@@ -43,11 +43,18 @@
    @NotNull(message = "行业类型不可为空")
    private Integer industryType;

    @TableField(exist = false)
    private String industryName;

    @ApiModelProperty(value = "文件路径")
    @TableField("file_path")
    @NotBlank(message = "文件路径不可为空")
    private String filePath;

    @ApiModelProperty(value = "文件名称")
    @TableField("file_name")
    private String fileName;

    @ApiModelProperty(value = "文件格式")
    @TableField("format")
    @NotBlank(message = "文件格式不可为空")

 multi-system/src/main/java/com/gkhy/exam/system/domain/CompanyIndustryType.java

对比新文件
@@ -0,0 +1,45 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
@TableName("company_industry_type")
@ApiModel(value = "company_industry_type",description = "行业类型")
public class CompanyIndustryType implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("行业名称")
    @TableField(value = "name")
    private String name;

    @TableField(value = "del_flag")
    private Integer delFlag;

    @TableField(value = "create_by")
    private String createBy;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(value = "create_time")
    private LocalDateTime createTime;

    @TableField(value = "update_by")
    private String updateBy;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(value = "update_time")
    private LocalDateTime updateTime;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/StandardizedQuality.java

对比新文件
@@ -0,0 +1,66 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;

@Data
@TableName("standardized_quality")
@ApiModel(value = "standardized_quality",description = "质量体系手册")
public class StandardizedQuality implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @NotNull(message = "企业Id不可为空")
    @ApiModelProperty(value = "企业ID")
    @TableField("company_id")
    private Integer companyId;

    @ApiModelProperty(value = "企业名称")
    @TableField("company_name")
    private String companyName;

    @ApiModelProperty(value = "模板名称")
    @TableField("quality_name")
    @NotBlank(message = "模板名称不可为空")
    private String qualityName;

    @ApiModelProperty(value = "文件路径")
    @TableField("file_path")
    private String filePath;

    @ApiModelProperty(value = "文件格式")
    @TableField("format")
    private String format;

    @ApiModelProperty(value = "是否删除")
    @TableField("del_flag")
    private Integer delFlag;

    @TableField("create_by")
    private String createBy;

    @TableField("create_time")
    private LocalDateTime createTime;

    @TableField("update_by")
    private String updateBy;

    @TableField("update_time")
    private LocalDateTime updateTime;


}

 multi-system/src/main/java/com/gkhy/exam/system/domain/StandardizedTemplate.java

对比新文件
@@ -0,0 +1,73 @@
package com.gkhy.exam.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;

@Getter
@Setter
@TableName("standardized_template")
@ApiModel(value = "standardized_template",description = "标准化系统模板")
public class StandardizedTemplate implements Serializable {

    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @NotNull(message = "企业Id不可为空")
    @ApiModelProperty(value = "企业ID")
    @TableField("company_id")
    private Integer companyId;

    @ApiModelProperty(value = "企业名称")
    @TableField("company_name")
    private String companyName;

    @ApiModelProperty(value = "模板名称")
    @TableField("template_name")
    @NotBlank(message = "模板名称不可为空")
    private String templateName;

    @ApiModelProperty(value = "类型1体系标准2技术标准3应用标准4程序文件5作业指导书6记录及表单7技术类8生产类9其他知识产权")
    @TableField("template_type")
    @NotNull(message = "类型不可为空")
    private Integer templateType;

    @ApiModelProperty(value = "文件路径")
    @TableField("file_path")
    @NotBlank(message = "文件路径不可为空")
    private String filePath;

    @ApiModelProperty(value = "文件格式")
    @TableField("format")
    @NotBlank(message = "文件格式不可为空")
    private String format;

    @ApiModelProperty(value = "是否删除")
    @TableField("del_flag")
    private Integer delFlag;

    @TableField("create_by")
    private String createBy;

    @TableField("create_time")
    private LocalDateTime createTime;

    @TableField("update_by")
    private String updateBy;

    @TableField("update_time")
    private LocalDateTime updateTime;


}

 multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueDataReq.java

对比新文件
@@ -0,0 +1,39 @@
package com.gkhy.exam.system.domain.req;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.exam.system.domain.CatalogueDataFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class CatalogueDataReq {

    private String id;

    private Integer catalogueId;
    private Integer companyId;

    private String content;

    private String analysis;

    private Integer delFlag;

    private String createBy;

    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;

    private String updateBy;

    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date updateTime;

//    private List<CatalogueDataFile> files;
}

 multi-system/src/main/java/com/gkhy/exam/system/domain/req/CatalogueReq.java

对比新文件
@@ -0,0 +1,11 @@
package com.gkhy.exam.system.domain.req;

import lombok.Data;

@Data
public class CatalogueReq {
    private Integer type;
    private String mess;
    private Integer catalogueId;
    private Integer companyId;
}

 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueDataVo.java

对比新文件
@@ -0,0 +1,25 @@
package com.gkhy.exam.system.domain.vo;

import com.gkhy.exam.system.domain.CatalogueDataFile;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class CatalogueDataVo {


    private String id;
    private Integer catalogueId;
    private Integer companyId;
    private String companyName;
    private String content;
    private String analysis;
    private Integer delFlag;
    private String createBy;
    private Date createTime;
    private String updateBy;
    private Date updateTime;
    private List<CatalogueDataFile> files;
}

 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java

对比新文件
@@ -0,0 +1,23 @@
package com.gkhy.exam.system.domain.vo;

import lombok.Data;

import java.util.List;

@Data
public class CatalogueVo {

    private Integer id;

    private String  number;

    private Integer parentId;

    private String mess;
    private Integer type;

    private Integer delFlag;

    private List<CatalogueVo> children;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/SysDeptSaveDTOReq.java

@@ -30,7 +30,7 @@

    /** 负责人 */
    @ApiModelProperty("负责人")
    @NotNull(message = "负责人不能为空")
    //@NotNull(message = "负责人不能为空")
    private Long leaderUserId;

    @ApiModelProperty("公司id")

 multi-system/src/main/java/com/gkhy/exam/system/mapper/CatalogueMapper.java

对比新文件
@@ -0,0 +1,32 @@
package com.gkhy.exam.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.Catalogue;
import com.gkhy.exam.system.domain.CatalogueData;
import com.gkhy.exam.system.domain.CatalogueDataFile;
import com.gkhy.exam.system.domain.req.CatalogueReq;
import com.gkhy.exam.system.domain.vo.CatalogueDataVo;
import com.gkhy.exam.system.domain.vo.CatalogueVo;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;

import java.util.List;

@Mapper
public interface CatalogueMapper extends BaseMapper<Catalogue> {
    List<CatalogueVo> selectCatalogueList(CatalogueReq catalogueReq);

    List<CatalogueDataVo> selectCatalogueDataList(CatalogueReq catalogueReq);

    Integer insertCatalogueData(CatalogueData catalogueData);

    void insertCatalogueDataFile(CatalogueDataFile files);

    Integer updateCatalogueData(CatalogueData catalogueData);

    void updateCatalogueDataFile(CatalogueDataFile files);

    List<CatalogueDataFile> selectCatalogueDataFile(@Param("companyId") Integer companyId, @Param("catalogueId") Integer catalogueId);

    List<CatalogueData> selectByCompanyId(Integer companyId);
}

 multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.java

@@ -9,7 +9,7 @@

@Mapper
public interface CompanyIndustryTemplateMapper extends BaseMapper<CompanyIndustryTemplate> {
    List<CompanyIndustryTemplate> selectCompanyIndustryTemplateList(Integer companyId);
    List<CompanyIndustryTemplate> selectCompanyIndustryTemplateList(CompanyIndustryTemplate companyId);

    int updateCompanyIndustryTemplateById(CompanyIndustryTemplate template);
}

 multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java

@@ -15,5 +15,5 @@

    List<QualityTarget> selectByQualityId(Integer qualityId);

    void deleteByQualityIds(@Param("collect") List<Integer> collect);
    void deleteByQualityIds(@Param("qualityId") Integer qualityId);
}

 multi-system/src/main/java/com/gkhy/exam/system/mapper/StandardizedQualityMapper.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.exam.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.StandardizedQuality;
import com.gkhy.exam.system.domain.StandardizedTemplate;
import org.mapstruct.Mapper;

import java.util.List;

@Mapper
public interface StandardizedQualityMapper extends BaseMapper<StandardizedQuality> {
    List<StandardizedQuality> selectStandardizedQualityList(Integer companyId, Integer templateType);

    int updateStandardizedQualityById(StandardizedQuality template);
}

 multi-system/src/main/java/com/gkhy/exam/system/mapper/StandardizedTemplateMapper.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.exam.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.CompanyIndustryTemplate;
import com.gkhy.exam.system.domain.StandardizedTemplate;
import org.mapstruct.Mapper;

import java.util.List;

@Mapper
public interface StandardizedTemplateMapper extends BaseMapper<StandardizedTemplate> {
    List<StandardizedTemplate> selectStandardizedTemplateList(Integer companyId, Integer templateType);

    int updateStandardizedTemplateById(StandardizedTemplate template);
}

 multi-system/src/main/java/com/gkhy/exam/system/mapper/SysIndustryTypeMapper.java

对比新文件
@@ -0,0 +1,15 @@
package com.gkhy.exam.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyIndustryType;
import org.mapstruct.Mapper;

import java.util.List;
@Mapper
public interface SysIndustryTypeMapper extends BaseMapper<CompanyIndustryType> {
    List<CompanyIndustryType> selectIndustryTypeList();



}

 multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java

对比新文件
@@ -0,0 +1,36 @@
package com.gkhy.exam.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.Catalogue;
import com.gkhy.exam.system.domain.CatalogueDataFile;
import com.gkhy.exam.system.domain.req.CatalogueDataReq;
import com.gkhy.exam.system.domain.req.CatalogueReq;
import com.gkhy.exam.system.domain.vo.CatalogueVo;

import java.util.List;

public interface CatalogueService extends IService<Catalogue> {
    CommonResult selectCatalogueList(CatalogueReq catalogueReq);

    CommonResult insertCatalogue(Catalogue catalogue);

    CommonResult updateCatalogue(Catalogue catalogue);

    CommonResult deletedCatalogue(Integer catalogueId);

    CommonResult selectCatalogueDataList(CatalogueReq catalogueReq);

    CommonResult insertCatalogueData(CatalogueDataReq catalogue);

    CommonResult updateCatalogueData(CatalogueDataReq catalogue);

    CommonResult deletedCatalogueData(Integer catalogueDataId);

    CommonResult insertCatalogueDataFile(CatalogueDataFile catalogueDataFile);

    CommonResult updateCatalogueDataFile(CatalogueDataFile catalogueDataFile);

    CommonResult deletedCatalogueDataFile(Integer dataFileId);
}

 multi-system/src/main/java/com/gkhy/exam/system/service/CompanyIndustryTemplateService.java

@@ -7,7 +7,7 @@
import com.gkhy.exam.system.domain.CompanyRoster;

public interface CompanyIndustryTemplateService extends IService<CompanyIndustryTemplate> {
    CommonPage selectCompanyIndustryTemplateList(Integer companyId);
    CommonPage selectCompanyIndustryTemplateList(CompanyIndustryTemplate companyId);

    CommonResult insertCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate);


 multi-system/src/main/java/com/gkhy/exam/system/service/StandardizedTemplateService.java

对比新文件
@@ -0,0 +1,29 @@
package com.gkhy.exam.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyIndustryTemplate;
import com.gkhy.exam.system.domain.StandardizedQuality;
import com.gkhy.exam.system.domain.StandardizedTemplate;

public interface StandardizedTemplateService extends IService<StandardizedTemplate> {
    CommonPage selectStandardizedTemplateList(Integer companyId,Integer templateType);

    CommonResult insertStandardizedTemplate(StandardizedTemplate standardizedTemplate);

    CommonResult updateStandardizedTemplate(StandardizedTemplate standardizedTemplate);

    CommonResult deletedStandardizedTemplate(Integer id);


    CommonResult selectStandardizedQuality(Integer companyId);

    CommonResult insertStandardizedQuality(StandardizedQuality standardizedQuality);

    CommonResult updateStandardizedQuality(StandardizedQuality standardizedQuality);

    CommonResult deletedStandardizedQuality(Integer id);

    CommonResult getStandardizedQualityByCompanyId(Integer id);
}

 multi-system/src/main/java/com/gkhy/exam/system/service/SysIndustryTypeService.java

对比新文件
@@ -0,0 +1,20 @@
package com.gkhy.exam.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.system.domain.CompanyIndustryType;

public interface SysIndustryTypeService extends IService<CompanyIndustryType> {
    CommonPage selectIndustryTypeList();

    CommonResult insertIndustryType(CompanyIndustryType companyIndustryType);

    CommonResult updateIndustryType(CompanyIndustryType companyIndustryType);

    CommonResult deletedIndustryType(Integer industryId);

    CommonResult selectList();


}

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java

对比新文件
@@ -0,0 +1,200 @@
package com.gkhy.exam.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.Catalogue;
import com.gkhy.exam.system.domain.CatalogueData;
import com.gkhy.exam.system.domain.CatalogueDataFile;
import com.gkhy.exam.system.domain.SysCompany;
import com.gkhy.exam.system.domain.req.CatalogueDataReq;
import com.gkhy.exam.system.domain.req.CatalogueReq;
import com.gkhy.exam.system.domain.vo.CatalogueDataVo;
import com.gkhy.exam.system.domain.vo.CatalogueVo;
import com.gkhy.exam.system.mapper.CatalogueMapper;
import com.gkhy.exam.system.mapper.SysCompanyMapper;
import com.gkhy.exam.system.service.CatalogueService;
import com.gkhy.exam.system.service.SysCompanyService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class CatalogueServiceImpl extends ServiceImpl<CatalogueMapper, Catalogue> implements CatalogueService {

    @Autowired
    private CatalogueMapper catalogueMapper;
    @Autowired
    private SysCompanyMapper sysCompanyMapper;

    /**
     * 目录管理
     * @param catalogueReq
     * @return
     */
    @Override
    public CommonResult selectCatalogueList(CatalogueReq catalogueReq) {
        List<CatalogueVo> catalogueVos = catalogueMapper.selectCatalogueList(catalogueReq);
        List<CatalogueVo> collect = catalogueVos.stream().filter(catalogueVo -> catalogueVo.getParentId() == 0).collect(Collectors.toList());
        for (CatalogueVo catalogueVo : collect) {
            List<CatalogueVo> getchildren = getchildren(catalogueVo, catalogueVos);
            catalogueVo.setChildren(getchildren);
        }
        return CommonResult.success(collect);
    }

    private List<CatalogueVo> getchildren(CatalogueVo catalogueVo, List<CatalogueVo> catalogueVos) {
        List<CatalogueVo> catalogueCharlden = new ArrayList<>();
        for (CatalogueVo catalogue : catalogueVos) {
            if (catalogueVo.getId() == catalogue.getParentId()){
                catalogueCharlden.add(catalogue);
            }
        }
        for (CatalogueVo vo : catalogueCharlden) {
            List<CatalogueVo> getchildren = getchildren(vo, catalogueVos);
            vo.setChildren(getchildren);
        }
        return catalogueCharlden;
    }

    @Override
    public CommonResult insertCatalogue(Catalogue catalogue) {
        catalogue.setCreateBy(SecurityUtils.getUsername());
        catalogue.setCreateTime(LocalDate.now());
        int insert = catalogueMapper.insert(catalogue);
        if (insert>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult updateCatalogue(Catalogue catalogue) {
        catalogue.setUpdateBy(SecurityUtils.getUsername());
        catalogue.setUpdateTime(LocalDate.now());
        int i = catalogueMapper.updateById(catalogue);
        if (i>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult deletedCatalogue(Integer catalogueId) {

        CatalogueReq catalogueReq = new CatalogueReq();
        catalogueReq.setCatalogueId(catalogueId);
        List<CatalogueDataVo> catalogueDataVos = catalogueMapper.selectCatalogueDataList(catalogueReq);
        if (catalogueDataVos.size()>0){
            return CommonResult.failed("当前目录存在数据，请勿删除");
        }
        Catalogue catalogue = new Catalogue();
        catalogue.setId(catalogueId);
        catalogue.setDelFlag(2);
        catalogue.setUpdateTime(LocalDate.now());
        catalogue.setUpdateBy(SecurityUtils.getUsername());
        int i = catalogueMapper.updateById(catalogue);
        if (i>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }


    /**
     * 目录数据管理
     * @param catalogueReq
     * @return
     */
    @Override
    public CommonResult selectCatalogueDataList(CatalogueReq catalogueReq) {
        List<CatalogueDataVo> catalogueData = catalogueMapper.selectCatalogueDataList(catalogueReq);
        for (CatalogueDataVo catalogueDatum : catalogueData) {
            List<CatalogueDataFile> catalogueDataFiles = catalogueMapper.selectCatalogueDataFile(catalogueDatum.getCompanyId(), catalogueDatum.getCatalogueId());
            catalogueDatum.setFiles(catalogueDataFiles);
        }
        return CommonResult.success(catalogueData);
    }

    @Override
    public CommonResult insertCatalogueData(CatalogueDataReq catalogue) {
        List<CatalogueData> catalogueData1 = catalogueMapper.selectByCompanyId(catalogue.getCompanyId());
        if (catalogueData1.size()>0){
            return CommonResult.failed("当前企业已有数据，请勿重复添加");
        }
        CatalogueData catalogueData = new CatalogueData();
        BeanUtils.copyProperties(catalogue,catalogueData);
        Integer i = catalogueMapper.insertCatalogueData(catalogueData);
//        List<CatalogueDataFile> files = catalogue.getFiles();
        if (i>0){
//            for (CatalogueDataFile file : files) {
//                file.setCatalogueDataId(catalogueData.getId());
//                file.setCreateBy(SecurityUtils.getUsername());
//                file.setCreateTime(LocalDate.now());
//                catalogueMapper.insertCatalogueDataFile(file);
//            }
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult updateCatalogueData(CatalogueDataReq catalogue) {
        CatalogueData catalogueData = new CatalogueData();
        BeanUtils.copyProperties(catalogue,catalogueData);
        Integer i = catalogueMapper.updateCatalogueData(catalogueData);
//        List<CatalogueDataFile> files = catalogue.getFiles();
        if (i>0){
//            catalogueMapper.updateCatalogueDataFile(files);
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult deletedCatalogueData(Integer catalogueDataId) {
        CatalogueData catalogueData = new CatalogueData();
        catalogueData.setId(catalogueDataId);
        catalogueData.setDelFlag(2);
        catalogueData.setUpdateBy(SecurityUtils.getUsername());
        catalogueData.setUpdateTime(LocalDate.now());
        Integer i = catalogueMapper.updateCatalogueData(catalogueData);
        if (i>9){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult insertCatalogueDataFile(CatalogueDataFile catalogueDataFile) {
        catalogueDataFile.setCreateTime(LocalDate.now());
        catalogueDataFile.setCreateBy(SecurityUtils.getUsername());
        catalogueMapper.insertCatalogueDataFile(catalogueDataFile);
        return CommonResult.success();
    }

    @Override
    public CommonResult updateCatalogueDataFile(CatalogueDataFile catalogueDataFile) {
        catalogueDataFile.setUpdateBy(SecurityUtils.getUsername());
        catalogueDataFile.setUpdateTime(LocalDate.now());
        catalogueMapper.updateCatalogueDataFile(catalogueDataFile);
        return CommonResult.success();
    }

    @Override
    public CommonResult deletedCatalogueDataFile(Integer dataFileId) {
        CatalogueDataFile catalogueDataFile = new CatalogueDataFile();
        catalogueDataFile.setId(dataFileId);
        catalogueDataFile.setDelFlag(2);
        catalogueDataFile.setUpdateTime(LocalDate.now());
        catalogueDataFile.setUpdateBy(SecurityUtils.getUsername());
        catalogueMapper.updateCatalogueDataFile(catalogueDataFile);
        return CommonResult.success();
    }
}

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyIndustryTemplateServiceImpl.java

@@ -31,7 +31,7 @@


    @Override
    public CommonPage selectCompanyIndustryTemplateList(Integer companyId) {
    public CommonPage selectCompanyIndustryTemplateList(CompanyIndustryTemplate companyId) {
        boolean admin = SecurityUtils.adminUser();
        if (!admin){
            if (companyId==null){
@@ -47,7 +47,7 @@
    public CommonResult insertCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();

        SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId());
        SysCompany sysCompany = sysCompanyService.selectCompanyById(companyIndustryTemplate.getCompanyId()==null?SecurityUtils.getCompanyId():companyIndustryTemplate.getCompanyId());
        companyIndustryTemplate.setCompanyName(sysCompany.getName());
        companyIndustryTemplate.setCreateBy(loginUser.getUsername());
        companyIndustryTemplate.setCreateTime(LocalDateTime.now());
@@ -61,7 +61,7 @@
    @Override
    public CommonResult updateCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId());
        SysCompany sysCompany = sysCompanyService.selectCompanyById(companyIndustryTemplate.getCompanyId()==null?SecurityUtils.getCompanyId():companyIndustryTemplate.getCompanyId());
        companyIndustryTemplate.setCompanyName(sysCompany.getName());
        companyIndustryTemplate.setUpdateBy(loginUser.getUsername());
        companyIndustryTemplate.setUpdateTime(LocalDateTime.now());

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java

@@ -98,7 +98,7 @@
    public CommonResult updateQuality(QualityTargetReq qualityTargetReq) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        List<QualityTarget> qualityTargets = qualityTargetReq.getQualityTargets();
        List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
//        List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
        Quality quality = new Quality();
        BeanUtils.copyProperties(qualityTargetReq,quality);
        //获取对应企业
@@ -107,7 +107,7 @@
        quality.setUpdateBy(loginUser.getUsername());
        quality.setUpdateTime(LocalDateTime.now());
        int insert = qualityMapper.updateQualityById(quality);
        qualityTargetMapper.deleteByQualityIds(collect);
        qualityTargetMapper.deleteByQualityIds(qualityTargetReq.getId());
        for (QualityTarget qualityTarget : qualityTargets) {
            qualityTarget.setQualityId(quality.getId());
            qualityTarget.setCompanyId(qualityTargetReq.getCompanyId());

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java

对比新文件
@@ -0,0 +1,193 @@
package com.gkhy.exam.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.domain.TreeSelect;
import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.common.domain.model.LoginUserDetails;
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.*;
import com.gkhy.exam.system.mapper.*;
import com.gkhy.exam.system.service.CompanyIndustryTemplateService;
import com.gkhy.exam.system.service.ISysDeptService;
import com.gkhy.exam.system.service.StandardizedTemplateService;
import com.gkhy.exam.system.service.SysCompanyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
public class StandardizedTemplateServiceImpl extends ServiceImpl<StandardizedTemplateMapper, StandardizedTemplate> implements StandardizedTemplateService {

    @Autowired
    private StandardizedTemplateMapper standardizedTemplateMapper;
    @Autowired
    private SysCompanyService sysCompanyService;

    @Autowired
    private StandardizedQualityMapper standardizedQualityMapper;

    @Autowired
    private SysFunctionalDistributionMapper sysFunctionalDistributionMapper;

    @Autowired
    private ISysDeptService iSysDeptService;

    @Autowired
    private CompanySummaryMapper companySummaryMapper;
    @Autowired
    private CompanyQualityPolicyMapper companyQualityPolicyMapper;
    @Override
    public CommonPage selectStandardizedTemplateList(Integer companyId, Integer templateType) {
        boolean admin = SecurityUtils.adminUser();
        if (!admin){
            if (companyId==null){
                companyId = SecurityUtils.getCompanyId().intValue();
            }
        }
        PageUtils.startPage();
        List<StandardizedTemplate> companyIndustryTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(companyId, templateType);
        return CommonPage.restPage(companyIndustryTemplates);
    }

    @Override
    public CommonResult insertStandardizedTemplate(StandardizedTemplate standardizedTemplate) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();

        SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue());
        standardizedTemplate.setCompanyName(sysCompany.getName());
        standardizedTemplate.setCreateBy(loginUser.getUsername());
        standardizedTemplate.setCreateTime(LocalDateTime.now());
        int insert = standardizedTemplateMapper.insert(standardizedTemplate);
        if (insert>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult updateStandardizedTemplate(StandardizedTemplate standardizedTemplate) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue());
        standardizedTemplate.setCompanyName(sysCompany.getName());
        standardizedTemplate.setUpdateBy(loginUser.getUsername());
        standardizedTemplate.setUpdateTime(LocalDateTime.now());
        int update = standardizedTemplateMapper.updateStandardizedTemplateById(standardizedTemplate);
        if (update>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult deletedStandardizedTemplate(Integer standardizedTemplateId) {
        StandardizedTemplate standardizedTemplate = new StandardizedTemplate();
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        standardizedTemplate.setUpdateBy(loginUser.getUsername());
        standardizedTemplate.setUpdateTime(LocalDateTime.now());
        standardizedTemplate.setDelFlag(1);
        standardizedTemplate.setId(standardizedTemplateId);
        int i = standardizedTemplateMapper.updateById(standardizedTemplate);
        if (i>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult selectStandardizedQuality(Integer companyId) {
        boolean admin = SecurityUtils.adminUser();
        LambdaQueryWrapper<StandardizedQuality> lambdaQueryWrapper = Wrappers.<StandardizedQuality>lambdaQuery();
        if (!admin){
            if (companyId==null){
                lambdaQueryWrapper.eq(StandardizedQuality::getCompanyId, SecurityUtils.getCompanyId().intValue());
            }
        }
        lambdaQueryWrapper.eq(StandardizedQuality::getDelFlag, 0);
        return CommonResult.success(standardizedQualityMapper.selectList(lambdaQueryWrapper));
    }

    @Override
    public CommonResult insertStandardizedQuality(StandardizedQuality standardizedQuality) {
        LambdaQueryWrapper<StandardizedQuality> eq = new LambdaQueryWrapper<StandardizedQuality>().eq(StandardizedQuality::getCompanyId, standardizedQuality.getCompanyId());
        standardizedQualityMapper.delete(eq);
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();

        SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue());
        standardizedQuality.setCompanyName(sysCompany.getName());
        standardizedQuality.setCreateBy(loginUser.getUsername());
        standardizedQuality.setCreateTime(LocalDateTime.now());
        int insert = standardizedQualityMapper.insert(standardizedQuality);
        if (insert>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult updateStandardizedQuality(StandardizedQuality standardizedQuality) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue());
        standardizedQuality.setCompanyName(sysCompany.getName());
        standardizedQuality.setUpdateBy(loginUser.getUsername());
        standardizedQuality.setUpdateTime(LocalDateTime.now());
        int update = standardizedQualityMapper.updateStandardizedQualityById(standardizedQuality);
        if (update>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult deletedStandardizedQuality(Integer id) {
        LambdaQueryWrapper<StandardizedQuality> lambdaQueryWrapper = Wrappers.<StandardizedQuality>lambdaQuery()
                .eq(StandardizedQuality::getId, id)
                .eq(StandardizedQuality::getDelFlag, 0);
        StandardizedQuality standardizedQuality = new StandardizedQuality();
        standardizedQuality.setDelFlag(1);
        standardizedQuality.setUpdateBy(SecurityUtils.getUsername());
        standardizedQuality.setUpdateTime(LocalDateTime.now());
        standardizedQualityMapper.update(standardizedQuality, lambdaQueryWrapper);
        return CommonResult.success();
    }

    @Override
    public CommonResult getStandardizedQualityByCompanyId(Integer companyId) {
        Map<String, Object> map = new HashMap<>();
        //程序文件
        List<StandardizedTemplate> companyIndustryTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(companyId, 4);
        //职能分配
        List<SysFunctionalDistribution> sysFunctionalDistributions = sysFunctionalDistributionMapper.selectListVo(companyId.longValue());
        //部门
        SysDept sysDept = new SysDept();
        sysDept.setCompanyId(companyId.longValue());
        List<TreeSelect> treeSelects = iSysDeptService.selectDeptTreeList(sysDept);

        //公司概况
        List<CompanySummary> companySummaries = companySummaryMapper.selectCompanySummaryList(companyId);

        //质量方针
        List<CompanyQualityPolicy> companyQualityPolicies = companyQualityPolicyMapper.selectCompanyQualityPolicyList(companyId);
        //质量方针
        map.put("companyQualityPolicies", companyQualityPolicies);
        //公司概况
        map.put("companySummaries", companySummaries);
        //部门
        map.put("treeSelects", treeSelects);
        //职能分配
        map.put("sysFunctionalDistributions", sysFunctionalDistributions);
        //程序文件
        map.put("companyIndustryTemplates", companyIndustryTemplates);
        return CommonResult.success(map);
    }
}

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysCommonServiceImpl.java

@@ -262,7 +262,7 @@
    @Override
    @Transactional(rollbackFor = RuntimeException.class)
    public void importStudent() {
        String path="/home/java/train_exam/back/安全教育学员模板.xlsx";
        String path="/home/java/multi_system/back/安全教育学员模板.xlsx";
      //  String path="F:/kzy/乱七八糟/安全教育学员模板.xlsx";
        List<StudentExcelData> studentExcelDataList=EasyExcel.read(path, StudentExcelData.class,new StudentExcelDataListener()).sheet().doReadSync();
        List<ExStudent> students=new ArrayList<>();

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java

@@ -325,9 +325,7 @@

    @Override
    public List<SysFunctionalDistribution> getFunctionalDistributionList(Long companyId) {
        if (companyId != null){
            companyId = SecurityUtils.getCompanyId();
        }

       return sysFunctionalDistributionMapper.selectListVo(companyId);
    }


 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysIndustryTypeServiceImpl.java

对比新文件
@@ -0,0 +1,73 @@
package com.gkhy.exam.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.domain.model.LoginUserDetails;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.CompanyIndustryType;
import com.gkhy.exam.system.mapper.SysIndustryTypeMapper;
import com.gkhy.exam.system.service.SysIndustryTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.List;

@Service
public class SysIndustryTypeServiceImpl extends ServiceImpl<SysIndustryTypeMapper, CompanyIndustryType> implements SysIndustryTypeService {

    @Autowired
    private SysIndustryTypeMapper sysIndustryTypeMapper;

    @Override
    public CommonPage selectIndustryTypeList() {
        PageUtils.startPage();
        List<CompanyIndustryType> companyIndustryTypes = sysIndustryTypeMapper.selectIndustryTypeList();
        return CommonPage.restPage(companyIndustryTypes);
    }

    @Override
    public CommonResult insertIndustryType(CompanyIndustryType companyIndustryType) {
        LoginUserDetails loginUser = SecurityUtils.getLoginUser();
        companyIndustryType.setCreateBy(loginUser.getUsername());
        companyIndustryType.setCreateTime(LocalDateTime.now());
        int insert = sysIndustryTypeMapper.insert(companyIndustryType);
        if (insert > 0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult updateIndustryType(CompanyIndustryType companyIndustryType) {
        companyIndustryType.setUpdateBy(SecurityUtils.getUsername());
        companyIndustryType.setUpdateTime(LocalDateTime.now());
        int i = sysIndustryTypeMapper.updateById(companyIndustryType);
        if (i>=0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult deletedIndustryType(Integer industryId) {
        CompanyIndustryType companyIndustryType = new CompanyIndustryType();
        companyIndustryType.setId(industryId);
        companyIndustryType.setDelFlag(2);
        companyIndustryType.setUpdateBy(SecurityUtils.getUsername());
        companyIndustryType.setUpdateTime(LocalDateTime.now());
        int i = sysIndustryTypeMapper.updateById(companyIndustryType);
        if (i>0){
            return CommonResult.success();
        }
        return CommonResult.failed();
    }

    @Override
    public CommonResult selectList() {
        List<CompanyIndustryType> companyIndustryTypes = sysIndustryTypeMapper.selectIndustryTypeList();
        return CommonResult.success(companyIndustryTypes);
    }
}

 multi-system/src/main/resources/mapper/system/CatalogueMapper.xml

对比新文件
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.system.mapper.CatalogueMapper">
    <insert id="insertCatalogueData" keyProperty="id" useGeneratedKeys="true">
        INSERT INTO  `catalogue_data`
            (  `company_id`, `catalogue_id`, `content`, `analysis`,  `create_by`, `create_time` )
        VALUES
            ( #{companyId}, #{catalogueId}, #{content}, #{analysis}, #{createBy}, #{createTime} )
    </insert>

    <insert id="insertCatalogueDataFile">
        INSERT INTO `train_exam`.`catalogue_data_file`
            ( `catalogue_id`,`company_id`, `name`, `file_path`,`file_name`, `type`, `create_by`, `create_time` )
        VALUES
            ( #{catalogueId},#{companyId}, #{name}, #{filePath},#{fileName}, #{type}, #{createBy}, #{createTime} )
    </insert>

    <update id="updateCatalogueData">
        UPDATE `catalogue_data`
        SET
            <if test="companyId!=null">
                `company_id` = #{companyId},
            </if>
            <if test="catalogueId!=null">
                `catalogue_id` = #{catalogueId},
            </if>
            <if test="content!=null and content!=''">
                `content` = #{content},
            </if>
            <if test="analysic!=null and analysic!=''">
                `analysis` = #{analysis},
            </if>
            <if test="delFlag!=null and delFlag!=''">
                `del_flag` = #{delFlag},
            </if>
            <if test="updateBy!=null and update!=''">
                `update_by` = #{updateBy},
            </if>
            <if test="updateTime!=null">
                `update_time` = #{updateTime}
            </if>
        WHERE
            `id` = #{id}
    </update>
    <update id="updateCatalogueDataFile">
            UPDATE `catalogue_data_file`
                set
                <if test="catalogueId!=null">
                    `catalogue_id` = #{catalogueId},
                </if>
                <if test="companyId!=null">
                    `company_id` = #{companyId},
                </if>
                <if test="name!=null">
                    `name` = #{name},
                </if>
                <if test="filePath!=null">
                    `file_path` = #{filePath},
                </if>
                <if test="fileName!=null">
                    `file_name` = #{fileName},
                </if>
                <if test="type!=null">
                    `type` = #{type},
                </if>
                <if test="delFlag != null and delFlag != ''" >
                    del_flag = #{delFlag},
                </if>
                <if test="updateBy != null" >
                    update_by = #{updateBy},
                </if>
                <if test="updateTime != null" >
                    update_time = #{updateTime}
                </if>
            where id = #{id}
    </update>

    <select id="selectCatalogueList" resultType="com.gkhy.exam.system.domain.vo.CatalogueVo">
        SELECT
            `id`,
            `parent_id`,
            `number`,
            `mess`,
            `type`,
            `del_flag`,
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
        FROM
            catalogue
        WHERE del_flag = 1
          <if test="type!=null">
              and type = #{type}
          </if>
        ORDER BY create_time ASC
    </select>
    <select id="selectCatalogueDataList" resultType="com.gkhy.exam.system.domain.vo.CatalogueDataVo">
        SELECT
            cd.`id`,
            cd.`company_id`,
            sc.name,
            cd.`catalogue_id`,
            cd.`content`,
            cd.`analysis`,
            cd.`del_flag`,
            cd.`create_by`,
            cd.`create_time`,
            cd.`update_by`,
            cd.`update_time`
        FROM
            catalogue_data cd
        left join sys_company sc on cd.company_id = sc.id
        WHERE
            cd.del_flag = 1
          <if test="catalogueId!=null">
              and cd.catalogue_id = #{catalogueId}
          </if>
        <if test="companyId!=null">
            and cd.company_id = #{companyId}
        </if>
    </select>
    <select id="selectCatalogueDataFile" resultType="com.gkhy.exam.system.domain.CatalogueDataFile">
        SELECT
            id,
            `catalogue_data_id`,
            company_id,
            catalogue_id,
            `name`,
            `file_path`,
            file_name,
            `type`,
            `create_by`,
            `create_time`
        FROM
            catalogue_data_file
        WHERE
            company_id = #{companyId} and catalogue_id = #{catalogueId} and del_flag =1
    </select>
    <select id="selectByCompanyId" resultType="com.gkhy.exam.system.domain.CatalogueData">
        SELECT
            `id`,
            `company_id`,
            name,
            `catalogue_id`,
            `content`,
            `analysis`,
            `del_flag`,
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
        FROM
            catalogue_data
        where company_id = #{companyId} and del_flag = 1

    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml

@@ -19,6 +19,9 @@
            <if test="filePath != null and filePath !=''" >
                file_path = #{filePath},
            </if>
            <if test="fileName != null and fileName !=''" >
                file_name = #{fileName},
            </if>
            <if test="format != null and format !=''" >
                format = #{format},
            </if>
@@ -43,26 +46,32 @@

    <select id="selectCompanyIndustryTemplateList" resultType="com.gkhy.exam.system.domain.CompanyIndustryTemplate">
        SELECT
            `id`,
            `company_id`,
            `company_name`,
            `template_name`,
            `industry_type`,
            `file_path`,
            `format`,
            `del_flag`,
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
            ci.`id`,
            ci.`company_id`,
            ci.`company_name`,
            ci.`template_name`,
            ci.`industry_type`,
            cit.name as industry_name,
            ci.`file_path`,
            ci.`file_name`,
            ci.`format`,
            ci.`del_flag`,
            ci.`create_by`,
            ci.`create_time`,
            ci.`update_by`,
            ci.`update_time`
        FROM
        company_industry_template
        company_industry_template ci
        left join company_industry_type cit on ci.industry_type = cit.id
        WHERE
            del_flag = 0
            ci.del_flag = 0
        <if test="companyId!=null and companyId!=''">
            and company_id = #{companyId}
            and ci.company_id = #{companyId}
        </if>
        <if test="industryType!=null">
            and ci.industry_type = #{industryType}
        </if>
        ORDER BY
            create_time DESC
            ci.create_time DESC
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.gkhy.exam.system.mapper.QualityDecomposeMapper">
    <insert id="insertDecompose" useGeneratedKeys="true" keyProperty="id">
        INSERT INTO
            `train_exam`.`quality_decompose`
           `quality_decompose`
            ( `company_id`, `quality_id`, `number`, `serial`, `fiction_id`, `fiction_name`, `fiction_time`, `check_id`,`check_name`,
             `check_time`, `ratify_id`, `ratify_name`, `ratify_time`, `create_by`, `create_time`)
        VALUES

 multi-system/src/main/resources/mapper/system/QualityMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.gkhy.exam.system.mapper.QualityMapper">

    <insert id="insertQuality" useGeneratedKeys="true" keyProperty="id">
        INSERT INTO `train_exam`.`quality` (
        INSERT INTO `quality` (
            `company_id`,`company_name`,`year`,`num`,`type`, `depart_id`,`depart_name`,`method`,`compilation_id`, `compilation_name`,`compilation_time`,`quality_id`,`quality_name`,
            `quality_time`,`lead_id`,`lead_name`,`lead_time`,`create_by`,`create_time`
        )

 multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.gkhy.exam.system.mapper.QualityTargetMapper">

    <insert id="insertQualityTargets">
        INSERT INTO `train_exam`.`quality_target` (
        INSERT INTO `quality_target` (
            `company_id`,`quality_id`,`message`,`num`,`method`,`calculate`,`data_source`,`depart_name`,
            `frequency`,`duty_name`,`remark`,`create_by`,`create_time`
        )
@@ -14,6 +14,7 @@
             #{item.createBy},#{item.createTime})
        </foreach>
    </insert>

    <update id="updateQualityTargetById">
        <foreach collection="qualityTargets" item="item" index="index" separator=";">
            UPDATE quality_target
@@ -70,13 +71,11 @@
            where id = #{item.id}
        </foreach>
    </update>
    <delete id="deleteByQualityIds">
        UPDATE quality_target set del_flag =2 where quality_id in (
        <foreach collection="collect" item="id" separator=",">
            #{id}
        </foreach>
            )
    </delete>

    <update id="deleteByQualityIds">
        UPDATE quality_target set del_flag =2 where quality_id = #{qualityId}
    </update>

    <select id="selectByQualityId" resultType="com.gkhy.exam.system.domain.QualityTarget">
        select `id`,`company_id`,`quality_id`,`message`,`num`,`method`,`calculate`,`data_source`,`depart_name`,
               `frequency`,`duty_name`,`remark`,`del_flag`,`create_by`,`create_time`,`update_by`,`update_time`

 multi-system/src/main/resources/mapper/system/StandardizedQualityMapper.xml

对比新文件
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.system.mapper.StandardizedQualityMapper">
    <update id="updateStandardizedQualityById" parameterType="com.gkhy.exam.system.domain.StandardizedQuality">
        UPDATE standardized_quality
        <set>
            <if test="companyId != null and companyId != ''" >
                company_id = #{companyId},
            </if>
            <if test="companyName != null and companyName != ''" >
                company_name = #{companyName},
            </if>
            <if test="qualityName != null and qualityName !=''" >
                quality_name = #{qualityName},
            </if>
            <if test="filePath != null and filePath !=''" >
                file_path = #{filePath},
            </if>
            <if test="format != null and format !=''" >
                format = #{format},
            </if>
            <if test="delFlag != null and delFlag != ''" >
                del_flag = #{delFlag},
            </if>
            <if test="createBy != null" >
                create_by = #{createBy},
            </if>
            <if test="createTime != null" >
                create_time = #{createTime},
            </if>
            <if test="updateBy != null" >
                update_by = #{updateBy},
            </if>
            <if test="updateTime != null" >
                update_time = #{updateTime}
            </if>
        </set>
        where id = #{id}
    </update>

    <select id="selectStandardizedQualityList" resultType="com.gkhy.exam.system.domain.StandardizedQuality">
        SELECT
            `id`,
            `company_id`,
            `company_name`,
            `quality_name`,
            `file_path`,
            `format`,
            `del_flag`,
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
        FROM
        standardized_quality
        WHERE
            del_flag = 0

        <if test="companyId!=null and companyId!=''">
            and company_id = #{companyId}
        </if>
        ORDER BY
            create_time DESC
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml

对比新文件
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.system.mapper.StandardizedTemplateMapper">
    <update id="updateStandardizedTemplateById" parameterType="com.gkhy.exam.system.domain.StandardizedTemplate">
        UPDATE standardized_template
        <set>
            <if test="companyId != null and companyId != ''" >
                company_id = #{companyId},
            </if>
            <if test="companyName != null and companyName != ''" >
                company_name = #{companyName},
            </if>
            <if test="templateName != null and templateName !=''" >
                template_name = #{templateName},
            </if>
            <if test="templateType != null " >
                template_type = #{templateType},
            </if>
            <if test="filePath != null and filePath !=''" >
                file_path = #{filePath},
            </if>
            <if test="format != null and format !=''" >
                format = #{format},
            </if>
            <if test="delFlag != null and delFlag != ''" >
                del_flag = #{delFlag},
            </if>
            <if test="createBy != null" >
                create_by = #{createBy},
            </if>
            <if test="createTime != null" >
                create_time = #{createTime},
            </if>
            <if test="updateBy != null" >
                update_by = #{updateBy},
            </if>
            <if test="updateTime != null" >
                update_time = #{updateTime}
            </if>
        </set>
        where id = #{id}
    </update>

    <select id="selectStandardizedTemplateList" resultType="com.gkhy.exam.system.domain.StandardizedTemplate">
        SELECT
            `id`,
            `company_id`,
            `company_name`,
            `template_name`,
            `template_type`,
            `file_path`,
            `format`,
            `del_flag`,
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
        FROM
        standardized_template
        WHERE
            del_flag = 0 and template_type = #{templateType}

        <if test="companyId!=null and companyId!=''">
            and company_id = #{companyId}
        </if>
        ORDER BY
            create_time DESC
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/SysIndustryTypeMapper.xml

对比新文件
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.system.mapper.SysIndustryTypeMapper">
    <select id="selectIndustryTypeList" resultType="com.gkhy.exam.system.domain.CompanyIndustryType">
        select id,name,del_flag,create_by,create_time,update_by,update_time from company_industry_type where del_flag = 1
    </select>
</mapper>

 pom.xml

@@ -204,6 +204,37 @@
                <artifactId>easyexcel</artifactId>
                <version>${easyexcel.version}</version>
            </dependency>
<!--            <dependency>-->
<!--                <groupId>com.deepoove</groupId>-->
<!--                <artifactId>poi-tl</artifactId>-->
<!--                <version>1.10.0</version>-->
<!--            </dependency>-->

<!--            &lt;!&ndash; 如果需要解析HTML &ndash;&gt;-->
<!--            <dependency>-->
<!--                <groupId>org.jsoup</groupId>-->
<!--                <artifactId>jsoup</artifactId>-->
<!--                <version>1.15.3</version>-->
<!--            </dependency>-->

<!--            <dependency>-->
<!--                <groupId>com.itextpdf</groupId>-->
<!--                <artifactId>itextpdf</artifactId>-->
<!--                <version>5.5.13.3</version>-->
<!--            </dependency>-->
<!--            <dependency>-->
<!--                <groupId>org.bouncycastle</groupId>-->
<!--                <artifactId>bcprov-jdk15on</artifactId>-->
<!--                <version>1.68</version>-->
<!--            </dependency>-->
<!--            &lt;!&ndash; 支持中文 &ndash;&gt;-->
<!--            <dependency>-->
<!--                <groupId>com.itextpdf</groupId>-->
<!--                <artifactId>itext-asian</artifactId>-->
<!--                <version>5.2.0</version>-->
<!--            </dependency>-->


        </dependencies>
    </dependencyManagement>