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/web/TemplateController.java
对比新文件 @@ -0,0 +1,123 @@ 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 = true, 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(@RequestParam("companyId") 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(@RequestParam("companyId") 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); } } 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;
对比新文件 @@ -0,0 +1,68 @@ 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") @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/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/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/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/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); } multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java
对比新文件 @@ -0,0 +1,147 @@ 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.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.CompanyIndustryTemplateMapper; import com.gkhy.exam.system.mapper.StandardizedQualityMapper; import com.gkhy.exam.system.mapper.StandardizedTemplateMapper; import com.gkhy.exam.system.service.CompanyIndustryTemplateService; 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.List; @Service public class StandardizedTemplateServiceImpl extends ServiceImpl<StandardizedTemplateMapper, StandardizedTemplate> implements StandardizedTemplateService { @Autowired private StandardizedTemplateMapper standardizedTemplateMapper; @Autowired private SysCompanyService sysCompanyService; @Autowired private StandardizedQualityMapper standardizedQualityMapper; @Override public CommonPage selectStandardizedTemplateList(Integer companyId, Integer templateType) { boolean admin = SecurityUtils.adminUser(); if (!admin){ if (companyId==null){ throw new ApiException("非管理员操作，查询条件不可为空"); } } 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(SecurityUtils.getCompanyId()); 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(SecurityUtils.getCompanyId()); 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) { LambdaQueryWrapper<StandardizedQuality> lambdaQueryWrapper = Wrappers.<StandardizedQuality>lambdaQuery() .eq(StandardizedQuality::getCompanyId, companyId) .eq(StandardizedQuality::getDelFlag, 0); return CommonResult.success(standardizedQualityMapper.selectOne(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(SecurityUtils.getCompanyId()); 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(SecurityUtils.getCompanyId()); 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(); } } 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); }
对比新文件 @@ -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>
