物化检测平台问题反馈带修改意见 2021.5.11反馈问题 已解决

检测报告中的  “以下空白” 艺术字 插入未解决

cement-business/pom.xml

@@ -31,6 +31,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -48,10 +49,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -748,7 +749,12 @@ public class EntrustController {
 		beanParams.put("userFax", entrustVo.getUserFax()==null?"":entrustVo.getUserFax());
 		beanParams.put("projectName", entrustVo.getProjectName()==null?"":entrustVo.getProjectName());
 		beanParams.put("sampleNum", entrustVo.getSampleNum()==null?"":entrustVo.getSampleNum());
-
+		LocalDate entrustDate = entrustVo.getEntrustDate();
+		if(entrustVo.getEntrustDate() != null){
+			beanParams.put("year", String.valueOf(entrustVo.getEntrustDate().getYear()));
+			beanParams.put("month", String.valueOf(entrustVo.getEntrustDate().getMonthValue()));
+			beanParams.put("day", String.valueOf(entrustVo.getEntrustDate().getDayOfMonth()));
+		}
 		//获取委托单样品列表(不包含平行样)
 		List<SampleVo> sampleList = new ArrayList<>(entrustVo.getSampleList().size());
 		entrustVo.getSampleList()

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.csource.fastdfs.ClientGlobal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -27,9 +28,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import sun.misc.BASE64Encoder;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -121,6 +126,11 @@ public class ReportController {
         List<GrainReport> list6 = iEntrustService.getGrainList(entrustId);
         beanParams.put("list6", list6);
 
+        //todo 以下空白 显示excel艺术字形式
+        File file=new File("以下空白.jpg");
+        String headStr = "data:image/jpg;base64,";
+        beanParams.put("img1",headStr + getImageStr(file.getAbsolutePath()));
+
         //事项-----不用处理
         //品质-----不用处理
 
@@ -129,6 +139,23 @@ public class ReportController {
 
     }
 
+    //getImageStr方法如下(可以封装成单独的工具类)
+    private String getImageStr(String imgFile){
+        InputStream in = null;
+        byte[] data = null;
+        try {
+            in = new FileInputStream(imgFile);
+            data = new byte[in.available()];
+            in.read(data);
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        BASE64Encoder encoder = new BASE64Encoder();
+        return encoder.encode(data);
+    }
+
+
     //检测依据 第一条记录
     private String getFirstList(List<String> list) {
         if(list != null && list.size()>0){

cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustReport.java

@@ -2,7 +2,9 @@ package cn.wise.sc.cement.business.entity;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description: 委托报告
@@ -64,6 +66,8 @@ public class EntrustReport {
 	 */
 	private String teamName;
 
+	private List<Team> teamList = new ArrayList<>();
+
 	/**
 	 * 检测依据 ids
 	 */

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java

@@ -365,7 +365,7 @@ public class CommonServiceImpl {
 			}
 
 			//拼接的值的保留位数数据库 retain字段必须为null
-			// 焦渣   塑性指数   辊磨  可磨 易磨性 工业分析  易烧性
+			// 焦渣   塑性指数   辊磨  可磨 易磨性 工业分析  易烧性  磨蚀性
 
 
 			/*else if(name.equals("St,ad")){

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -5115,7 +5115,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 		//缓存 60s
 		if (!redisUtil.existsKey(teamKey)) {
-			List<Team> teams = teamMapper.selectList(new QueryWrapper<>());
+			QueryWrapper<Team> teamQW = new QueryWrapper<>();
+			teamQW.eq("qualifications", 1 );
+			teamQW.orderByAsc("group_id","sort_no");
+			List<Team> teams = teamMapper.selectList(teamQW);
 			String value = JSON.toJSONString(teams);
 			redisUtil.setString(teamKey, value, 60);
 		}
@@ -5127,31 +5130,55 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		List<Team> teams = JSON.parseArray(redisUtil.getString(teamKey) + "", Team.class);
 		List<Method> methods = JSON.parseArray(redisUtil.getString(methodKey) + "", Method.class);
 		list.forEach(arg -> {
+			// 检测项目应该与委托单对应  按照检测项本身顺序来
+			/*teams.forEach(opt -> {
+				String teamIds = arg.getTeamIds();
+				if(StringUtils.isNoneBlank(teamIds)){
+					String[] teamSplit = teamIds.split("、");
+					for (String idStr : teamSplit) {
+						int id = Integer.parseInt(idStr);
+						if (opt.getId() == id && 1 == opt.getQualifications()) {
+							String teamName = replaceSub(opt.getName());
+							if (StrUtil.isBlank(arg.getTeamName())) {
+								arg.setTeamName(teamName);
+							} else {
+								arg.setTeamName(arg.getTeamName() + "、" + teamName);
+							}
+						}
+					}
+				}
+			});*/
+			List<Team> teamList = new ArrayList<>();
 			String teamIds = arg.getTeamIds();
 			if(StringUtils.isNoneBlank(teamIds)){
 				String[] teamSplit = teamIds.split("、");
+				// 检测项目应该与委托单对应  按照检测项本身顺序来
 				for (String idStr : teamSplit) {
 					int id = Integer.parseInt(idStr);
+					//检测项 如果为资质外 不进行报告展示
 					teams.forEach(opt -> {
 						if (opt.getId() == id && 1 == opt.getQualifications()) {
-							String teamName = replaceSub(opt.getName());
+							teamList.add(opt);
+							/*String teamName = replaceSub(opt.getName());
 							if (StrUtil.isBlank(arg.getTeamName())) {
 								arg.setTeamName(teamName);
 							} else {
 								arg.setTeamName(arg.getTeamName() + "、" + teamName);
-							}
+							}*/
 						}
 					});
 				}
 			}
+			arg.setTeamList(teamList);
 
 			String methodNumbers = arg.getMethodNumbers();
 			if(StringUtils.isNoneBlank(methodNumbers)){
 				String[] methodSplit = methodNumbers.split("、");
 				for (String idStr : methodSplit) {
 //					String id = Integer.parseInt(idStr) + "";
+					//检测依据 如果标准号为空  不进行报告展示
 					methods.forEach(opt -> {
-						if (idStr.equals(opt.getNumber())) {
+						if (idStr.equals(opt.getNumber())  && StrUtil.isNotBlank(opt.getStandard())) {
 							String standard = StringUtils.isNoneBlank(opt.getStandard())?opt.getStandard():"";
 							if (StrUtil.isBlank(arg.getMethodName())) {
 								arg.setMethodName(standard+"  " + opt.getName());
@@ -5209,20 +5236,31 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		List<String> JCList= new ArrayList<>();
 		List<String> TRList= new ArrayList<>();
 		List<String> ELSEList= new ArrayList<>();
+		List<Integer> teamIdList = new ArrayList<>();
+		List<Team> teamList = new ArrayList<>();
 		source.forEach(arg -> {
 			if(arg.getEquipmentId() != null){
 				equipmentIds.add(arg.getEquipmentId());
 			}
 			//获取使用的设备id view
 			//关联检测项目
-			if (StrUtil.isNotBlank(arg.getTeamName())) {
+			if(arg.getTeamList() != null && arg.getTeamList().size()>0){
+				for(Team tt : arg.getTeamList()){
+					if(!teamIdList.contains(tt.getId())){
+						teamList.add(tt);
+						teamIdList.add(tt.getId());
+					}
+				}
+			}
+			/*if (StrUtil.isNotBlank(arg.getTeamName())) {
 				String[] teamSplits = arg.getTeamName().split("、");
 				for (String teamName : teamSplits) {
 					if(!rts.getTeamNames().contains(teamName)){
 						rts.getTeamNames().add(teamName);
 					}
 				}
-			}
+			}*/
+
 			//关联检测依据
 			if (StrUtil.isNotBlank(arg.getMethodName())) {
 				String[] methodSplits = arg.getMethodName().split("~~~、");
@@ -5249,6 +5287,17 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			}
 
 		});
+
+		//检测项顺序
+		List<Team> teamListAsc = teamList.stream().sorted(Comparator.comparing(Team::getGroupId).thenComparing(Team::getSortNo)).collect(Collectors.toList());
+		teamListAsc.forEach(opt -> {
+			String teamName = replaceSub(opt.getName());
+			if(!rts.getTeamNames().contains(teamName)){
+				rts.getTeamNames().add(teamName);
+			}
+		});
+
+		//检测依据顺序
 		GBList.addAll(JCList);
 		GBList.addAll(TRList);
 		GBList.addAll(ELSEList);
@@ -5516,9 +5565,13 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//磨蚀性结果拆分
 			String fsxLastResult = reportMap.get(ElementKey.Fsx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Fsx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Fsx.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(fsxLastResult) && fsxLastResult.contains("=")){
-				Map<String,String> fsxMap = splitLastResult(fsxLastResult);
-				report.setAi(fsxMap==null || org.springframework.util.StringUtils.isEmpty(fsxMap.get("Ai(g)")) ?"—":fsxMap.get("Ai(g)"));
+			if(StringUtils.isNotBlank(fsxLastResult)){
+				if(fsxLastResult.contains("=")){
+					Map<String,String> fsxMap = splitLastResult(fsxLastResult);
+					report.setAi(fsxMap==null || org.springframework.util.StringUtils.isEmpty(fsxMap.get("Ai(g)")) ?"—":fsxMap.get("Ai(g)"));
+				}else{
+					report.setAi(fsxLastResult);
+				}
 			}else{
 				report.setAi("—");
 			}

cement-business/src/main/resources/templates/entrust2.ftl

@@ -2776,7 +2776,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>年</w:t>
+                                 <w:t>${year}年</w:t>
                             </w:r>
                             <w:r wsp:rsidRPr="003B3488">
                                 <w:rPr>
@@ -2806,7 +2806,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>月</w:t>
+                                <w:t>${month}月</w:t>
                             </w:r>
                             <w:r wsp:rsidR="00FF4A3A">
                                 <w:rPr>
@@ -2829,7 +2829,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>日</w:t>
+                                <w:t>${day}日</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -2972,7 +2972,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>年</w:t>
+                                <w:t>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;年</w:t>
                             </w:r>
                             <w:r wsp:rsidRPr="003B3488">
                                 <w:rPr>
@@ -2995,7 +2995,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>月</w:t>
+                                <w:t>&#160;&#160;&#160;&#160;月</w:t>
                             </w:r>
                             <w:r wsp:rsidRPr="003B3488">
                                 <w:rPr>
@@ -3025,7 +3025,7 @@
                                     <w:sz-cs
                                             w:val="21"/>
                                 </w:rPr>
-                                <w:t>日</w:t>
+                                <w:t>&#160;&#160;&#160;&#160;日</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>