From cac939bb4469b181844f0537fc6866fc23da9054 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 03 十二月 2025 16:20:34 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 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 d6ceab9..afcf9fb 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
@@ -1,5 +1,6 @@
package com.gkhy.exam.system.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,17 +15,13 @@
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 com.gkhy.exam.system.service.*;
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;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class StandardizedTemplateServiceImpl extends ServiceImpl<StandardizedTemplateMapper, StandardizedTemplate> implements StandardizedTemplateService {
@@ -47,17 +44,32 @@
private CompanySummaryMapper companySummaryMapper;
@Autowired
private CompanyQualityPolicyMapper companyQualityPolicyMapper;
+
+ @Autowired
+ private CustomerService customerService;
+
+ @Autowired
+ private ProductServiceMapper productServiceMapper;
@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();
}
}
PageUtils.startPage();
- List<StandardizedTemplate> companyIndustryTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(companyId, templateType);
- return CommonPage.restPage(companyIndustryTemplates);
+ List<StandardizedTemplate> standardizedTemplates =new ArrayList<>();
+ //templateType==2 || templateType==10 ||
+ if ( templateType == 3){
+ standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateListV2(standardizedTemplate);
+ }else {
+ standardizedTemplates = standardizedTemplateMapper.selectStandardizedTemplateList(standardizedTemplate);
+ }
+
+ return CommonPage.restPage(standardizedTemplates);
}
@Override
@@ -69,6 +81,15 @@
standardizedTemplate.setCreateBy(loginUser.getUsername());
standardizedTemplate.setCreateTime(LocalDateTime.now());
int insert = standardizedTemplateMapper.insert(standardizedTemplate);
+
+ if (standardizedTemplate.getTemplateType().equals(4)&&standardizedTemplate.getTemplateName().contains("满意度")){
+ Customer customer = new Customer();
+ customer.setCompanyId(standardizedTemplate.getCompanyId());
+ customer.setFileName(standardizedTemplate.getTemplateName());
+ customer.setFilePath(standardizedTemplate.getFilePath());
+ customerService.insertCustomer(customer);
+ }
+
if (insert>0){
return CommonResult.success();
}
@@ -109,8 +130,10 @@
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::getCompanyId, companyId);
+ }else {
+ if (companyId != null){
+ lambdaQueryWrapper.eq(StandardizedQuality::getCompanyId, companyId);
}
}
lambdaQueryWrapper.eq(StandardizedQuality::getDelFlag, 0);
@@ -165,12 +188,17 @@
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());
//部门
SysDept sysDept = new SysDept();
sysDept.setCompanyId(companyId.longValue());
+ sysDept.setResponsType("1");
List<TreeSelect> treeSelects = iSysDeptService.selectDeptTreeList(sysDept);
//公司概况
@@ -188,6 +216,25 @@
map.put("sysFunctionalDistributions", sysFunctionalDistributions);
//程序文件
map.put("companyIndustryTemplates", companyIndustryTemplates);
+ //产品和服务实现过程
+
+ LambdaQueryWrapper<ProductService> lambdaQueryWrapper = Wrappers.<ProductService>lambdaQuery()
+ .eq(ProductService::getCompanyId, companyId)
+ .eq(ProductService::getDelFlag, 0);
+ List<ProductService> productServices = productServiceMapper.selectList(lambdaQueryWrapper);
+ if (ObjectUtil.isNotEmpty(productServices)){
+ List<String> fileUrls = productServices.stream().map(ProductService::getFileUrl).collect(Collectors.toList());
+ List< String> fileUrlsData = fileUrls.stream().map(fileUrl -> {
+ List<String> collect = Arrays.stream(fileUrl.split(",")).collect(Collectors.toList());
+ return collect;
+ }).flatMap(Collection::stream).collect(Collectors.toList());
+// for (String fileUrl : fileUrls) {
+// List<String> collect = Arrays.stream(fileUrl.split(",")).collect(Collectors.toList());
+// }
+ map.put("productServiceDatas", fileUrlsData);
+ }else {
+ map.put("productServiceDatas", new ArrayList<>());
+ }
return CommonResult.success(map);
}
}
--
Gitblit v1.9.2