禅道的bug修复

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanTrainingMapper.xml

@@ -55,7 +55,7 @@
         IF(ISNULL(pt.assessment),'',pt.assessment)  as 考核人,
         IF(ISNULL(pt.implementation),'',pt.implementation)  as 实施情况
         from plan_training pt
-        (@i:=@i+1) as 序号,
+        ,(select @i:=0)aa
         <include refid="where"/>
         ORDER BY pt.id ASC
     </select>

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

@@ -356,6 +356,9 @@ public class CommonServiceImpl {
 				countMap.put(name, CheckCountUtil.countYMXCode(resultMap));
 			}else if(name.equals("激光粒度分析")){
 				countMap.put(name,CheckCountUtil.countJGLD(resultMap));
+			}else if(name.equals("可磨")){
+				String km = CheckCountUtil.countKm(resultMap);
+				countMap.put(name, km);
 			}
 
 

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

@@ -528,7 +528,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				return BaseResponse.errorMsg("请选择项目类型");
 			}
 			if (entrust.getProjectId() == null) {
-				return BaseResponse.errorMsg("请选择项目类型");
+				return BaseResponse.errorMsg("请选择项目");
 			}
 			entrust.setStatus(9); //修改待确认
 			entrust.setProjectType(query.getProjectType());
@@ -543,6 +543,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				.setSampleNum(query.getSampleList().size())
 				.setIsTop(0);
 
+		if (query.getSampleList() == null || query.getSampleList().size() <= 0) {
+			return BaseResponse.errorMsg("样品及检测项不可为空");
+		}
+
 		if (query.getSampleList() != null && query.getSampleList().size() > 0) {
 			//对样品信息进行判断
 			for (SampleQuery sampleQuery : query.getSampleList()) {
@@ -1751,6 +1755,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			//最大的平行样编号放入redis
 			System.out.println("审批时的最大本所编号*******************************************" + lastCementCode);
 			redisUtil.setString("maxCementCode", lastCementCode);
+		}else{
+			return BaseResponse.errorMsg("样品及检测项不可为空");
 		}
 		return BaseResponse.okMsg("成功");
 	}
@@ -5164,7 +5170,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
 				Map<String,String> kmMap = splitLastResult(kmLastResult);
 				report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
-				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
+				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("制样率")) ?"—":kmMap.get("制样率"));
 			}else{
 				report.setHgi("—");
 				report.setCyl("—");

cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java

@@ -414,6 +414,30 @@ public class CheckCountUtil {
 		return  count;
 	}
 
+	/**
+	 * 求可磨
+	 * @param resultMap
+	 * @return
+	 */
+	public static String countKm(Map<String, String> resultMap) {
+		String count = "";
+
+		String HGI="";
+		String ZYL="";  //制样率
+		if( StringUtils.isNotBlank(resultMap.get("HGI"))){
+			HGI = resultMap.get("HGI").trim();
+		}
+		if( StringUtils.isNotBlank(resultMap.get("制样率"))){
+			ZYL  = resultMap.get("制样率").trim();
+		}
+
+		count = "HGI="+HGI+" \n 制样率="+ZYL;
+		return  count;
+	}
+
+
+
+
 
 	/**
 	 * 求SO3
@@ -567,10 +591,12 @@ public class CheckCountUtil {
 			}
 		}
 		return  endResult;
+	}
+
+
 
 
 
-	}
 
 	/**
 	 * 求报出_Mad  （Mad1 + Mad2 ）/ 2