multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/CompanyBasicController.java
@@ -8,6 +8,7 @@ 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 = "企业基础信息管理") @@ -26,6 +27,9 @@ @Autowired private CompanyRosterService companyRosterService; @Autowired private CompanyIndustryTemplateService companyIndustryTemplateService; /** @@ -274,6 +278,53 @@ } /** * 行业模版 * @param companyId * @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("/industryTemplate/list") public CommonResult selectCompanyIndustryTemplateList(Integer companyId){ return CommonResult.success(companyIndustryTemplateService.selectCompanyIndustryTemplateList(companyId)); } /** * 行业模版新增 * @param companyRoster * @return */ @ApiOperation(value = "行业模版新增") @PostMapping("/industryTemplate/insert") public CommonResult insertCompanyIndustryTemplate(@Validated @RequestBody CompanyIndustryTemplate companyRoster){ return companyIndustryTemplateService.insertCompanyIndustryTemplate(companyRoster); } /** * 企业花名册修改 * @param companyIndustryTemplate * @return */ @ApiOperation(value = "行业模版修改") @PostMapping("/industryTemplate/update") public CommonResult updateCompanyIndustryTemplate(@Validated @RequestBody CompanyIndustryTemplate companyIndustryTemplate){ return companyIndustryTemplateService.updateCompanyIndustryTemplate(companyIndustryTemplate); } /** * 行业模版删除 * @param industryTemplateId * @return */ @ApiOperation(value = "行业模版删除") @GetMapping("/industryTemplate/deleted") public CommonResult deletedCompanyIndustryTemplate(@RequestParam("companyRosterId") Integer industryTemplateId){ return companyIndustryTemplateService.deletedCompanyIndustryTemplate(industryTemplateId); }
对比新文件 @@ -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("company_industry_template") @ApiModel(value = "company_industry_template",description = "行业模板") public class CompanyIndustryTemplate 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安防") @TableField("industry_type") @NotNull(message = "行业类型不可为空") private Integer industryType; @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/CompanyRoster.java
@@ -16,7 +16,7 @@ @Getter @Setter @TableName("company_roster") @ApiModel(value = "company_roster",description = "员工花名册") @ApiModel(value = "company_roster",description = "员工信息") public class CompanyRoster implements Serializable { @ApiModelProperty("主键") multi-system/src/main/java/com/gkhy/exam/system/mapper/CompanyIndustryTemplateMapper.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.CompanyRoster; import org.mapstruct.Mapper; import java.util.List; @Mapper public interface CompanyIndustryTemplateMapper extends BaseMapper<CompanyIndustryTemplate> { List<CompanyIndustryTemplate> selectCompanyIndustryTemplateList(Integer companyId); int updateCompanyIndustryTemplateById(CompanyIndustryTemplate template); } multi-system/src/main/java/com/gkhy/exam/system/service/CompanyIndustryTemplateService.java
对比新文件 @@ -0,0 +1,17 @@ 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.CompanyRoster; public interface CompanyIndustryTemplateService extends IService<CompanyIndustryTemplate> { CommonPage selectCompanyIndustryTemplateList(Integer companyId); CommonResult insertCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate); CommonResult updateCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate); CommonResult deletedCompanyIndustryTemplate(Integer companyIndustryTemplateId); } multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyIndustryTemplateServiceImpl.java
对比新文件 @@ -0,0 +1,89 @@ 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.exception.ApiException; import com.gkhy.exam.common.utils.PageUtils; import com.gkhy.exam.common.utils.SecurityUtils; import com.gkhy.exam.system.domain.CompanyIndustryTemplate; import com.gkhy.exam.system.domain.CompanyRoster; import com.gkhy.exam.system.domain.SysCompany; import com.gkhy.exam.system.mapper.CompanyIndustryTemplateMapper; import com.gkhy.exam.system.mapper.CompanyRosterMapper; import com.gkhy.exam.system.service.CompanyIndustryTemplateService; 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 CompanyIndustryTemplateServiceImpl extends ServiceImpl<CompanyIndustryTemplateMapper, CompanyIndustryTemplate> implements CompanyIndustryTemplateService { @Autowired private CompanyIndustryTemplateMapper companyIndustryTemplateMapper; @Autowired private SysCompanyService sysCompanyService; @Override public CommonPage selectCompanyIndustryTemplateList(Integer companyId) { boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); if (!admin){ if (companyId==null){ throw new ApiException("非管理员操作，查询条件不可为空"); } } PageUtils.startPage(); List<CompanyIndustryTemplate> companyIndustryTemplates = companyIndustryTemplateMapper.selectCompanyIndustryTemplateList(companyId); return CommonPage.restPage(companyIndustryTemplates); } @Override public CommonResult insertCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); companyIndustryTemplate.setCompanyName(sysCompany.getName()); companyIndustryTemplate.setCreateBy(loginUser.getUsername()); companyIndustryTemplate.setCreateTime(LocalDateTime.now()); int insert = companyIndustryTemplateMapper.insert(companyIndustryTemplate); if (insert>0){ return CommonResult.success(); } return CommonResult.failed(); } @Override public CommonResult updateCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); companyIndustryTemplate.setCompanyName(sysCompany.getName()); companyIndustryTemplate.setUpdateBy(loginUser.getUsername()); companyIndustryTemplate.setUpdateTime(LocalDateTime.now()); int update = companyIndustryTemplateMapper.updateCompanyIndustryTemplateById(companyIndustryTemplate); if (update>0){ return CommonResult.success(); } return CommonResult.failed(); } @Override public CommonResult deletedCompanyIndustryTemplate(Integer companyIndustryTemplateId) { CompanyIndustryTemplate industryTemplate = new CompanyIndustryTemplate(); LoginUserDetails loginUser = SecurityUtils.getLoginUser(); industryTemplate.setUpdateBy(loginUser.getUsername()); industryTemplate.setUpdateTime(LocalDateTime.now()); industryTemplate.setDelFlag(1); industryTemplate.setId(companyIndustryTemplateId); int i = companyIndustryTemplateMapper.updateById(industryTemplate); if (i>0){ return CommonResult.success(); } return CommonResult.failed(); } } multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyRosterServiceImpl.java
@@ -82,7 +82,7 @@ LoginUserDetails loginUser = SecurityUtils.getLoginUser(); companyRoster.setUpdateBy(loginUser.getUsername()); companyRoster.setUpdateTime(LocalDateTime.now()); companyRoster.setDelFlag(2); companyRoster.setDelFlag(1); companyRoster.setId(companyRosterId); int i = companyRosterMapper.updateById(companyRoster); if (i>0){ multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
对比新文件 @@ -0,0 +1,68 @@ <?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.CompanyIndustryTemplateMapper"> <update id="updateCompanyIndustryTemplateById" parameterType="com.gkhy.exam.system.domain.CompanyIndustryTemplate"> UPDATE company_industry_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="industryType != null " > industry_type = #{industryType}, </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="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` FROM company_industry_template 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/CompanyRosterMapper.xml
@@ -46,7 +46,7 @@ FROM company_roster WHERE del_flag = 1 del_flag = 0 <if test="companyId!=null and companyId!=''"> and company_id = #{companyId} </if>
