装车 运输工序 查询当天工作两 功能优化

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java

@@ -258,9 +258,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         }
         //判断爆区是否存在
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel()).toString(), query.getStepName());
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel()).toString(), query.getStopeName());
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel()).toString(), query.getBlastAreaName());
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel(), query.getStepName());
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel(), query.getStopeName());
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel(), query.getBlastAreaName());
         TProcessesBlastdesignHoleVo holeVo = baseMapper.getByQuery(queryWrapper);
         if (holeVo != null) {
             return R.failed("炮孔设计中->泡孔设计中爆区已存在，StopeName,StepName,BlastAreaName");

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java

@@ -56,15 +56,28 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
         Map<String, Object> map = new HashMap<>();
         QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
         if (StringUtils.isNoneBlank(digDate)) {
-            qw.apply("DATE(DigDate) = digDate");
+            try {
+                SimpleDateFormat formatter = new SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss");
+                String startDate = digDate + " 00:00:00";
+                String endDate = digDate + " 23:59:59";
+                qw.between("DigDate", formatter.parse(startDate), formatter.parse(endDate));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         } else {
-            qw.apply("DATE(DigDate) = DATE(now())");
+            qw.apply("DigDate  BETWEEN CONVERT(varchar(100), GETDATE(), 23) +' 00:00:00' AND CONVERT(varchar(100), GETDATE(), 23) +' 23:59:59'");
         }
         List<TProcessesDigging> list = processesDiggingMapper.selectList(qw);
-        Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
-        Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
-        map.put("workTimes", workTimes);
-        map.put("workLoads", workLoads);
+        if(list!= null && list.size()>0){
+            Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
+            Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
+            map.put("workTimes", workTimes);
+            map.put("workLoads", workLoads);
+        }else{
+            map.put("workTimes", 0);
+            map.put("workLoads", 0);
+        }
         return R.ok(map);
 
     }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java

@@ -53,15 +53,28 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 		Map<String,Object> map = new HashMap<>();
 		QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
 		if(StringUtils.isNoneBlank(deliveryDate)){
-			qw.apply("DATE(DeliveryDate) = deliveryDate");
+			try {
+				SimpleDateFormat formatter = new SimpleDateFormat(
+						"yyyy-MM-dd HH:mm:ss");
+				String startDate = deliveryDate + " 00:00:00";
+				String endDate = deliveryDate + " 23:59:59";
+				qw.between("DeliveryDate", formatter.parse(startDate), formatter.parse(endDate));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 		}else{
-			qw.apply("DATE(DeliveryDate) = DATE(now())");
+			qw.apply("DeliveryDate  BETWEEN CONVERT(varchar(100), GETDATE(), 23) +' 00:00:00' AND CONVERT(varchar(100), GETDATE(), 23) +' 23:59:59'");
 		}
 		List<TProcessesTruck> list =  processesTruckMapper.selectList(qw);
-		Integer cshjs = list.stream().map(p -> p.getCshj()).reduce(Integer::sum).get();
-		Double dwhjs = list.stream().mapToDouble(TProcessesTruck::getDwhj).sum();
-		map.put("cshjs",cshjs);
-		map.put("dwhjs",dwhjs);
+		if(list!= null && list.size()>0){
+			Integer cshjs = list.stream().map(p -> p.getCshj()).reduce(Integer::sum).get();
+			Double dwhjs = list.stream().mapToDouble(TProcessesTruck::getDwhj).sum();
+			map.put("cshjs",cshjs);
+			map.put("dwhjs",dwhjs);
+		}else{
+			map.put("workTimes", 0);
+			map.put("workLoads", 0);
+		}
 		return R.ok(map);
 
 	}

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml

@@ -58,7 +58,7 @@
     </select>
 
 
-    <!-- 获取所有getPage列表 -->
+    <!-- 获取所有getByQuery列表 -->
     <select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
         <include refid="TProcessesBlastdesignVolumeColumns"/>