From 7cddd48bab10c8fc2480957b9bb42cd7061ac966 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期二, 01 七月 2025 16:23:23 +0800 Subject: [PATCH] 功能改造 --- multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java | 70 +++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 12 deletions(-) diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java index 24f47a1..d6ceab9 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java @@ -6,22 +6,25 @@ 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.CompanyIndustryTemplateMapper; -import com.gkhy.exam.system.mapper.StandardizedQualityMapper; -import com.gkhy.exam.system.mapper.StandardizedTemplateMapper; +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 { @@ -34,14 +37,22 @@ @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){ - throw new ApiException("非管理员操作,查询条件不可为空"); + companyId = SecurityUtils.getCompanyId().intValue(); } } PageUtils.startPage(); @@ -53,7 +64,7 @@ public CommonResult insertStandardizedTemplate(StandardizedTemplate standardizedTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue()); standardizedTemplate.setCompanyName(sysCompany.getName()); standardizedTemplate.setCreateBy(loginUser.getUsername()); standardizedTemplate.setCreateTime(LocalDateTime.now()); @@ -67,7 +78,7 @@ @Override public CommonResult updateStandardizedTemplate(StandardizedTemplate standardizedTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue()); standardizedTemplate.setCompanyName(sysCompany.getName()); standardizedTemplate.setUpdateBy(loginUser.getUsername()); standardizedTemplate.setUpdateTime(LocalDateTime.now()); @@ -95,10 +106,15 @@ @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)); + 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 @@ -107,7 +123,7 @@ standardizedQualityMapper.delete(eq); LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue()); standardizedQuality.setCompanyName(sysCompany.getName()); standardizedQuality.setCreateBy(loginUser.getUsername()); standardizedQuality.setCreateTime(LocalDateTime.now()); @@ -121,7 +137,7 @@ @Override public CommonResult updateStandardizedQuality(StandardizedQuality standardizedQuality) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue()); standardizedQuality.setCompanyName(sysCompany.getName()); standardizedQuality.setUpdateBy(loginUser.getUsername()); standardizedQuality.setUpdateTime(LocalDateTime.now()); @@ -144,4 +160,34 @@ 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); + } } -- Gitblit v1.9.2