11111

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -264,9 +264,15 @@ public class FbsWorkingStatisticsController {
 		 BigDecimal allNum = new BigDecimal("0");
 		 for (FbsWorkingStatistics o:list1){
 			 allHors = allHors.add(o.getWorkingHours());
-			 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+			 if(StringUtils.isNotBlank(o.getQualifiedNumber())){
+				 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+			 }
+		 }
+		 if(allNum.compareTo(new BigDecimal(0)) == 0){
+			 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),null,entity.getPkWorkshopDispatchList());
+		 }else{
+		 	 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
 		 }
-		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
 
 		 res.setCode("0");
 		 res.setMsg("成功");
@@ -396,9 +402,12 @@ public class FbsWorkingStatisticsController {
 		 BigDecimal allNum = new BigDecimal("0");
 		 for (FbsWorkingStatistics o:list1){
 			 allHors = allHors.add(o.getWorkingHours());
-			 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+			 if(StringUtils.isNotBlank(o.getQualifiedNumber())){
+				 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+			 }
 		 }
-		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(), entity.getPkWorkshopDispatchList());
+
+		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
 
          if(entity.getState().equals("1")){
          	//把数据传入u8数据库