From 84fd23e5e865bd5529441a0c318809a00362f44c Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 18 三月 2024 16:15:03 +0800
Subject: [PATCH] 添加签收图片对比功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTask2ServiceImpl.java | 28 ++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java | 17 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java | 7 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTask2Service.java | 9 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/ImgSearchVo.java | 17 ++
xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml | 11 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java | 23 +++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTask2Mapper.java | 7 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 112 ++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java | 2
xboot-modules/xboot-your/src/main/resources/mapper/OrderTask2Mapper.xml | 46 +++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2Imgs.java | 70 +++++++++++
14 files changed, 352 insertions(+), 7 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
index 8469616..7cdeb9a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
@@ -4,19 +4,27 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.OrderStatusCount;
import cn.exrick.xboot.your.entity.OrderTask2;
+import cn.exrick.xboot.your.entity.OrderTask2Imgs;
+import cn.exrick.xboot.your.entity.QueryRequest;
import cn.exrick.xboot.your.service.IOrderTask2Service;
+import cn.exrick.xboot.your.vo.ImgSearchVo;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.security.PermitAll;
import java.util.List;
+
+import static cn.hutool.poi.excel.sax.ElementName.v;
/**
* @author whj
@@ -26,6 +34,7 @@
@Api(tags = "璁㈠崟浠诲姟鍘嗗彶琛ㄧ鐞嗘帴鍙�")
@RequestMapping("/xboot/orderTask2")
@Transactional
+@PermitAll
public class OrderTask2Controller {
@Autowired
@@ -67,6 +76,14 @@
return new ResultUtil<IPage<OrderTask2>>().setData(data);
}
+ @RequestMapping(value = "/getByPageImgs", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ @PermitAll
+ public Result<IPage<OrderTask2Imgs>> getByPageImgs(QueryRequest queryRequest, ImgSearchVo imgSearchVo) {
+ IPage<OrderTask2Imgs> data = iOrderTask2Service.getTask2Imgs(imgSearchVo,queryRequest);
+ return new ResultUtil<IPage<OrderTask2Imgs>>().setData(data);
+ }
+
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<OrderTask2> saveOrUpdate(OrderTask2 orderTask2) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 0fb4216..ad1ec24 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -31,6 +31,7 @@
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
/**
@@ -178,6 +179,7 @@
}
}
+
@RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
public Result<Object> getAll(String sendTime) {
@@ -252,7 +254,7 @@
return new ResultUtil<Object>().setData(map);
}
- @RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
+ /* @RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩閰嶉�佷换鍔¤鎯呭垪琛�")
public Result<List<OrderTask>> getTodayOrder(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
@@ -273,6 +275,31 @@
for (OrderTask obj : list) {
obj.setCode(obj.getLinker());
}
+ return new ResultUtil<List<OrderTask>>().setData(list);
+ }*/
+
+ @RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇浠婃棩閰嶉�佷换鍔¤鎯呭垪琛�")
+ public Result<List<OrderTask>> getTodayOrder(String sendTime) {
+
+ //鑾峰彇璁㈠崟鍒楄〃
+ Area area = getArea(securityUtil.getCurrUser().getId());
+ if (area == null) {
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
+ }
+
+ QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
+ String format = getFormatDate(sendTime);
+// wrapper2.eq("a.area_id",area.getId());
+// wrapper2.eq("a.send_date",format);
+// wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
+ //List<OrderTask> list = iOrderTaskService.list2(wrapper2);
+ wrapper2.eq("area_id", area.getId());
+ wrapper2.eq("send_date", format);
+
+ wrapper2.orderByAsc("area_section_id").orderByAsc("seq").orderByAsc("status");
+ List<OrderTask> list = iOrderTaskService.list(wrapper2);
+
return new ResultUtil<List<OrderTask>>().setData(list);
}
@@ -856,4 +883,87 @@
;
return new ResultUtil<List<OrderStatusCount>>().setData(data);
}
+ @Autowired
+ private ISignCountService iSignCountService;
+
+ @RequestMapping(value = "/getStatusCounts", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
+ public Result<Object> getStatusCounts() {
+ System.err.println("鎵ц瀛樺偍鏁版嵁瀹氭椂浠诲姟鏃堕棿: " + LocalDateTime.now());
+ OrderStatusCount orderStatusCount = new OrderStatusCount();
+ List<OrderStatusCount> StatusCounts = new ArrayList<>();
+ List<OrderStatusCount> temps = iOrderTaskService.countStatus(orderStatusCount);
+ for (OrderStatusCount statusCount : temps) {
+ if("涓板崡02杞�".equals(statusCount.getLine())){
+ StatusCounts.add(statusCount);
+ }
+ }
+ if (StatusCounts != null && StatusCounts.size() != 0) {
+ List<SignCount> list = iSignCountService.list();
+ for (OrderStatusCount statusCount : StatusCounts) {
+ SignCount signCount = new SignCount();
+ boolean flag = false;
+ for (SignCount signCountS : list) {
+ if (signCountS.getTaskId().equals(statusCount.getId())) {
+ signCount.setId(signCountS.getId());
+ signCount.setCarName(statusCount.getCarName());
+ signCount.setAmount(statusCount.getAmount());
+ signCount.setSignCount(statusCount.getSignCount());
+ signCount.setAbnormalSign(statusCount.getAbnormalSign());
+ signCount.setBatch(statusCount.getBatch());
+ signCount.setLine(statusCount.getLine());
+ signCount.setNotSignCount(statusCount.getNotSignCount());
+ String SendDate=getBeforeOneDayByStringDate(statusCount.getSendDate());
+ signCount.setSendDate(SendDate);
+ signCount.setProportion(statusCount.getProportion());
+ signCount.setUserName(statusCount.getUserName());
+ signCount.setTaskId(statusCount.getId());
+ iSignCountService.saveOrUpdate(signCount);
+ System.out.println("鏇存柊鎴愬姛");
+ flag = true;
+ break;
+ }
+ }
+ if (flag) {
+ continue;
+ }
+ signCount.setCarName(statusCount.getCarName());
+ signCount.setAmount(statusCount.getAmount());
+ signCount.setSignCount(statusCount.getSignCount());
+ signCount.setAbnormalSign(statusCount.getAbnormalSign());
+ signCount.setBatch(statusCount.getBatch());
+ signCount.setLine(statusCount.getLine());
+ signCount.setNotSignCount(statusCount.getNotSignCount());
+
+ String SendDate=getBeforeOneDayByStringDate(statusCount.getSendDate());
+ signCount.setSendDate(SendDate);
+ signCount.setProportion(statusCount.getProportion());
+ signCount.setUserName(statusCount.getUserName());
+ signCount.setTaskId(statusCount.getId());
+ if (iSignCountService.saveOrUpdate(signCount)) {
+ System.out.println("瀹氭椂瀛樺偍鎴愬姛");
+ }
+ }
+ }
+ return null;
+ }
+
+ private String getBeforeOneDayByStringDate(String dateString) {
+ String times = "";
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date d;
+ try {
+ d = format.parse(dateString);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(d);
+ calendar.add(Calendar.DAY_OF_MONTH, -1); // 鍦ㄥ綋鍓嶆棩鍩虹涓�-1
+ String format1 = format.format(calendar.getTime());
+ times = format1;
+ //鑾峰彇String绫诲瀷鐨勬椂闂�
+
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return times;
+ }
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
index 04ba2c7..fb9ff0c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -33,6 +34,7 @@
@Api(tags = "鐘舵�佺粺璁℃姤琛ㄦ帴鍙�")
@RequestMapping("/xboot/signCount")
@Transactional
+@PermitAll
public class SignCountController {
@Autowired
@@ -84,9 +86,15 @@
@GetMapping("/outExcels")
@ApiOperation(value = "瀵煎嚭绛炬敹缁熻淇℃伅琛�", notes = "瀵煎嚭绛炬敹缁熻淇℃伅琛�")
+ @PermitAll
public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts2New(orderStatusCount);
- System.out.println(orderStatus);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("绛炬敹鏁伴噺缁熻鎶ヨ〃", "UTF-8");
@@ -100,12 +108,25 @@
@GetMapping(value = "/selectBySign")
public Result<IPage<OrderStatusCount>> signCounts(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
IPage<OrderStatusCount> data = this.iSignCountService.signCounts(orderStatusCount,queryRequest);
return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
}
@GetMapping(value = "/selectBySignNew")
+ @PermitAll
public Result<IPage<OrderStatusCount>> signCountsNew(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
IPage<OrderStatusCount> data = this.iSignCountService.signCountsNew(orderStatusCount,queryRequest);
return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2Imgs.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2Imgs.java
new file mode 100644
index 0000000..4be4468
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2Imgs.java
@@ -0,0 +1,70 @@
+package cn.exrick.xboot.your.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@ApiModel(value = "璁㈠崟浠诲姟鍘嗗彶琛�")
+public class OrderTask2Imgs {
+
+ @ApiModelProperty(value = "璁㈠崟Code")
+ private String code;
+
+ @ApiModelProperty(value = "鍖哄煙id")
+ private Long areaId;
+
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ private String areaName;
+
+ @ApiModelProperty(value = "鍒嗘ID")
+ private Long areaSectionId;
+
+ @ApiModelProperty(value = "鍒嗘鍚嶇О")
+ private String areaSectionName;
+
+ @ApiModelProperty(value = "杞︾墝鍙稩D")
+ private Long carId;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ private Long customerId;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty(value = "鏀惰揣浜篒D")
+ private Long customerReceiveId;
+
+ @ApiModelProperty(value = "鏀惰揣浜哄鍚�")
+ private String customerReceiveName;
+
+ @ApiModelProperty(value = "鏀惰揣鏃堕棿")
+ private String receiveTime;
+
+ @ApiModelProperty(value = "閫佽揣浜篿d")
+ private Long userId;
+
+ @ApiModelProperty(value = "閫佽揣浜�")
+ private String userName;
+
+ @ApiModelProperty(value = "鎺ユ敹浜哄師鍥�")
+ private String receiveImg;
+
+ @ApiModelProperty(value = "璐х墿鍥�,鎺ユ敹浜哄浘")
+ private String imgs;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍙戣揣鏃ユ湡")
+ private String sendDate;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璁㈠崟鏃ユ湡")
+ private String orderDate;
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTask2Mapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTask2Mapper.java
index 52f1dbb..311c3c1 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTask2Mapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTask2Mapper.java
@@ -1,7 +1,13 @@
package cn.exrick.xboot.your.mapper;
+import cn.exrick.xboot.your.entity.OrderStatusCount;
+import cn.exrick.xboot.your.entity.OrderTask2Imgs;
+import cn.exrick.xboot.your.vo.ImgSearchVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.OrderTask2;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -11,4 +17,5 @@
*/
public interface OrderTask2Mapper extends BaseMapper<OrderTask2> {
+ IPage<OrderTask2Imgs> getTask2Images(@Param("bo")ImgSearchVo imgSearchVo, Page<OrderTask2Imgs> page);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
index 68d6581..cf847d8 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
@@ -32,6 +32,11 @@
@Autowired
private ICustomerService iCustomerService;
+ /**
+ * 姣忓ぉ21鐐�31鍒嗘墽琛�
+ * 灏嗛厤閫佹棩鏈熶负浠婂ぉ鐨勮鍗曟暟鎹�(t_order_task)瀛樺叆鍘嗗彶璁㈠崟鏁版嵁琛紙t_order_task2锛�
+ */
+
@Scheduled(cron="0 31 21 * * ?")//姣忔櫄涓嬪崍9鐐瑰崐鐐规墽琛�
public void execute(){
String day = getDay(0);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
index 597d74d..ca695ab 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
@@ -1,4 +1,5 @@
package cn.exrick.xboot.your.schedulings;
+
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,6 +31,12 @@
@Autowired
private IDuoZhengService iDuoZhengService;
+ /**
+ * 姣忓ぉ21鐐规墽琛�
+ * 1.灏嗛厤閫佹棩鏈熷皬浜�10澶╁墠鐨勮鍗曞垹闄わ紙t_order_task锛夛紝鍚屾椂鍒犻櫎鐩稿簲璁㈠崟璇︽儏鏁版嵁(t_order_detail)
+ * 2.灏嗛厤閫佹棩鏈熷皬浜�20澶╁墠鐨勮鍗曚粠鍘熷璁㈠崟鏁版嵁琛ㄥ垹闄�(t_order_original)锛屽悓鏃跺垹闄ょ浉搴斿師濮嬭鍗曡鎯呮暟鎹�(t_order_original_detail)
+ */
+
@Scheduled(cron="0 0 21 * * ?")//姣忔櫄涓嬪崍9鐐规墽琛�
//@Scheduled(cron="0 33 17 * * ?")//娴嬭瘯
public void execute(){
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
index c394ff3..663766a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -44,6 +44,11 @@
@Autowired
private IOrderLogService iOrderLogService;
+ /**
+ * 姣忓ぉ15锛�59鍒嗗鐞�
+ * 鍦ㄥ師濮嬭鍗曟暟鎹紙t_order_task_original锛夎幏鍙栬鍗曟棩鏈熶负浠婂ぉ鐨勫師濮嬭鍗曪紝杞崲鎴愯鍗曟暟鎹瓨鍏ヨ鍗曚换鍔℃暟鎹〃锛坱_order_task锛�
+ */
+
@Scheduled(cron="0 59 15 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
//@Scheduled(cron="0 11 15 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
public void execute(){
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTask2Service.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTask2Service.java
index a480095..e675831 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTask2Service.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTask2Service.java
@@ -1,5 +1,9 @@
package cn.exrick.xboot.your.service;
+import cn.exrick.xboot.your.entity.OrderTask2Imgs;
+import cn.exrick.xboot.your.entity.QueryRequest;
+import cn.exrick.xboot.your.vo.ImgSearchVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.OrderTask2;
@@ -10,5 +14,8 @@
* @author whj
*/
public interface IOrderTask2Service extends IService<OrderTask2> {
-
+ /**
+ * 鑾峰彇鍥剧墖缁撴瀯
+ */
+ IPage<OrderTask2Imgs> getTask2Imgs(ImgSearchVo imgSearchVo, QueryRequest queryRequest);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTask2ServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTask2ServiceImpl.java
index 0b46d3f..ba0696d 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTask2ServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTask2ServiceImpl.java
@@ -1,16 +1,27 @@
package cn.exrick.xboot.your.serviceimpl;
+import cn.exrick.xboot.your.entity.OrderStatusCount;
+import cn.exrick.xboot.your.entity.OrderTask2Imgs;
+import cn.exrick.xboot.your.entity.QueryRequest;
import cn.exrick.xboot.your.mapper.OrderTask2Mapper;
import cn.exrick.xboot.your.entity.OrderTask2;
import cn.exrick.xboot.your.service.IOrderTask2Service;
+import cn.exrick.xboot.your.vo.ImgSearchVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 璁㈠崟浠诲姟鍘嗗彶琛ㄦ帴鍙ｅ疄鐜�
@@ -23,4 +34,21 @@
@Autowired
private OrderTask2Mapper orderTask2Mapper;
+
+ @Override
+ public IPage<OrderTask2Imgs> getTask2Imgs(ImgSearchVo imgSearchVo, QueryRequest queryRequest) {
+ Page<OrderTask2Imgs> page = new Page<>();
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(queryRequest.getPageSize() + "") && (queryRequest.getPageSize() != 0)) {
+ page.setCurrent(queryRequest.getPageNum());
+ page.setSize(queryRequest.getPageSize());
+ } else {
+ page.setCurrent(0);
+ page.setSize(-1);
+ }
+ imgSearchVo.setSendDateStart(imgSearchVo.getSendDateStart()+ " 00:00:00");
+ imgSearchVo.setSendDateEnd(imgSearchVo.getSendDateEnd()+ " 23:59:59");
+
+ IPage<OrderTask2Imgs> orderTask2ImgsIPage = this.orderTask2Mapper.getTask2Images(imgSearchVo, page);
+ return orderTask2ImgsIPage;
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
index 35c9a38..e4e8edf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
@@ -105,7 +105,9 @@
List<OrderStatusCount> records = this.signCountMapper.signCount2New(orderStatusCount);
List<OrderStatusCount> recordsAll = this.signCountMapper.signCountNewTotal(orderStatusCount);
for (int i=0;i<records.size();i++) {
+ //if(records.get(i).getCarName()==null) continue;
for (OrderStatusCount statusCountx: recordsAll) {
+ //if(statusCountx.getCarName()==null) continue;
if(records.get(i).getCarName().equals(statusCountx.getCarName())){
if(statusCountx.getProportion().length()>6){
String ss = statusCountx.getProportion().replace("%","");
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/ImgSearchVo.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/ImgSearchVo.java
new file mode 100644
index 0000000..19a972f
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/ImgSearchVo.java
@@ -0,0 +1,17 @@
+package cn.exrick.xboot.your.vo;
+
+import lombok.Data;
+
+@Data
+public class ImgSearchVo {
+
+ String sendDateStart;
+
+ String sendDateEnd;
+
+ String userName;
+
+ String carNo;
+
+ String customerName;
+}
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/OrderTask2Mapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/OrderTask2Mapper.xml
index ba0a32b..49e7b5a 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/OrderTask2Mapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/OrderTask2Mapper.xml
@@ -2,4 +2,50 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.exrick.xboot.your.mapper.OrderTask2Mapper">
+ <select id="getTask2Images" resultType="cn.exrick.xboot.your.entity.OrderTask2Imgs">
+ SELECT
+ a.code as code,
+ a.area_id as areaId,
+ b.name as areaName,
+ a.area_section_id as areaSectionId,
+ c.name as areaSectionName,
+ a.car_id as carId,
+ d.car_no as carNo,
+ a.customer_id as customerId,
+ a.customer_name as customerName,
+ a.customer_receive_id as customerReceiveId,
+ a.update_time as receiveTime,
+ e.name as customerReceiveName,
+ a.user_id as userId,
+ a.user_name as userName,
+ e.img as receiveImg,
+ a.img as imgs,
+ a.send_date as sendDate,
+ a.order_date as orderDate
+ FROM t_order_task2 a,t_area b,t_area_ection c,t_car d,t_customer_receive e
+ WHERE a.status = 1
+ <if test="bo.sendDateStart != null and bo.sendDateStart != ''">
+ AND send_date >= #{bo.sendDateStart}
+ </if>
+ <if test="bo.sendDateEnd != null and bo.sendDateEnd != ''">
+ AND send_date <= #{bo.sendDateEnd}
+ </if>
+ <if test="bo.userName != null and bo.userName != ''" >
+ AND a.user_name = #{bo.userName}
+ </if>
+ <if test="bo.carNo != null and bo.carNo != ''" >
+ AND d.car_no = #{bo.carNo}
+ </if>
+ <if test="bo.customerName != null and bo.customerName != ''" >
+ AND a.customer_name like CONCAT ('%',#{bo.customerName},'%')
+ </if>
+
+ and a.img is not null
+ and a.area_id = b.id
+ and a.area_section_id = c.id
+ and a.car_id = d.id
+ and a.customer_receive_id = e.id
+ order by a.order_date desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
index 4dddfd3..e2d22d7 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/SignCountMapper.xml
@@ -119,7 +119,7 @@
AND send_date >= #{bo.sendDateStart}
</if>
<if test="bo.sendDateEnd != null and bo.sendDateEnd != ''">
- AND send_date <= #{bo.sendDateEnd}
+ AND send_date <= #{bo.sendDateEnd} + ' 23:59:59'
</if>
</where>
GROUP BY
@@ -204,7 +204,8 @@
FROM
t_sign
<where>
- 1=1
+ 1=1 AND
+ car_name is not NULL
<if test="bo.line != null and bo.line != ''" >
AND line like CONCAT ('%', #{bo.line},'%')
</if>
@@ -248,7 +249,8 @@
FROM
t_sign
<where>
- 1=1
+ 1=1 AND
+ car_name is not NULL
<if test="bo.line != null and bo.line != ''" >
AND line like CONCAT ('%', #{bo.line},'%')
</if>
@@ -283,7 +285,8 @@
FROM
t_sign
<where>
- 1=1
+ 1=1 AND
+ car_name is not NULL
<if test="bo.line != null and bo.line != ''" >
AND line like CONCAT ('%', #{bo.line},'%')
</if>
--
Gitblit v1.9.1