Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

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

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -73,8 +75,16 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
 	@Override
 	public R<IPage<TProcessesDigging>> getPage(PageQuery pageQuery, String digDate) {
 		QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
-		if(StringUtils.isNoneBlank(digDate)){
-			qw.apply("DATE(DigDate) = digDate");
+		if (StringUtils.isNoneBlank(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();
+			}
 		}
 		qw.orderByDesc("DigDate");
 		IPage<TProcessesDigging> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());

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

@@ -17,6 +17,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,9 +70,21 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 	@Override
 	public R<IPage<TProcessesTruck>> getPage(PageQuery pageQuery, String deliveryDate) {
 		QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
-		if(StringUtils.isNoneBlank(deliveryDate)){
-			qw.apply("DATE(DeliveryDate) = deliveryDate");
+		if (StringUtils.isNoneBlank(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();
+			}
 		}
+
+		/*if(StringUtils.isNoneBlank(deliveryDate)){
+			qw.apply("DATE(DeliveryDate) = DATE("+deliveryDate+")");
+		}*/
 		qw.orderByDesc("DeliveryDate");
 		IPage<TProcessesTruck> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		page = processesTruckMapper.selectPage(page, qw);

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

@@ -79,8 +79,8 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 		BeanUtils.copyProperties(query, safeTrouble);
 		safeTroubleMapper.insert(safeTrouble);
 
-		//保存隐患图片
-		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("photos");
+		//保存隐患图片 变量名称只能用file  不能修改
+		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
 		if (photos != null && photos.size() > 0) {
 			return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(),  photos);
 		}
@@ -103,7 +103,7 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 		safeTroubleMapper.updateById(safeTrouble);
 
 		//保存隐患图片
-		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("photos");
+		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
 		if (photos != null && photos.size() > 0) {
 			return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(),  photos);
 		}