From 03a3edee9ff27fa9bb4b32dcda08e279c7c094c8 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 28 十一月 2025 17:30:11 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 3ec9946..809322f 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
@@ -49,8 +49,10 @@
@Autowired
private CustomerService customerService;
@Override
- public CommonPage selectStandardizedTemplateList(Integer companyId, Integer templateType) {
+ public CommonPage selectStandardizedTemplateList(StandardizedTemplate standardizedTemplate) {
boolean admin = SecurityUtils.adminUser();
+ Integer companyId = standardizedTemplate.getCompanyId();
+ Integer templateType = standardizedTemplate.getTemplateType();
if (!admin){
if (companyId==null){
companyId = SecurityUtils.getCompanyId().intValue();
@@ -58,10 +60,11 @@
}
PageUtils.startPage();
List<StandardizedTemplate> standardizedTemplates =new ArrayList<>();
- if (templateType==2 || templateType==10 || templateType == 3){
- standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateListV2(companyId, templateType, null);
+ //templateType==2 || templateType==10 ||
+ if ( templateType == 3){
+ standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateListV2(standardizedTemplate);
}else {
- standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(companyId, templateType);
+ standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(standardizedTemplate);
}
return CommonPage.restPage(standardizedTemplates);
@@ -183,7 +186,11 @@
public CommonResult getStandardizedQualityByCompanyId(Integer companyId) {
Map<String, Object> map = new HashMap<>();
//程序文件
- List<StandardizedTemplate> companyIndustryTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(companyId, 4);
+ StandardizedTemplate programFile = new StandardizedTemplate();
+ programFile.setTemplateType(4);
+ programFile.setCompanyId(companyId);
+ programFile.setSort(1);
+ List<StandardizedTemplate> companyIndustryTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(programFile);
//职能分配
List<SysFunctionalDistribution> sysFunctionalDistributions = sysFunctionalDistributionMapper.selectListVo(companyId.longValue());
//部门
--
Gitblit v1.9.2