From d8296ac6f51e8b429b0bc1d42ae678ddd217e003 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sun, 24 Apr 2022 20:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyQuery.java               |  2 +-
 .../BusDeliveredApplyMapper.java              |  6 ------
 .../BusDeliveredApplyMapper.xml               | 19 ++++++++++---------
 .../BusDeliveredApplyService.java             |  8 ++++++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java
index af930b2d1c..663c839a4b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java
@@ -57,7 +57,7 @@ public class BusDeliveredApplyQuery implements Query {
     private String name;
     @ApiModelProperty("申请日期")
     private String applyDateStart;
-    private Date applyDateEnd;
+    private String applyDateEnd;
     @ApiModelProperty(value = "申请人")
     private String applyName;
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
index cce3afc331..abf5d497a5 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
@@ -33,7 +33,6 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.Date;
 import java.util.List;
@@ -59,11 +58,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
 
     IPage<BusDeliveredApplyVo> selectPageVo(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
 
-    List<BusDeliveredApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
-
-    @Select("select * from bus_delivered_apply")
-    List<BusDeliveredApplyVo> selectListVo();
-
     int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today);
 
     List<Boolean> selectState(@Param("sidsList") List<String> sidsList);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
index 2dc8c1e9bf..c8868284de 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
@@ -4,15 +4,16 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
-        SELECT *
-        FROM bus_delivered_apply
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
-        SELECT *
+        SELECT sid,
+               case state
+                   when 1 then '待提交'
+                   when 2 then '待审核'
+                   when 3 then '已通过'
+                   when 4 then '未通过' end          as state,
+               contractNo,
+               name,
+               DATE_FORMAT(applyDate, '%Y-%m-%d') as applyDate,
+               applyName
         FROM bus_delivered_apply
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 5819f733dd..fdb95bab1e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -72,8 +72,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusDeliveredUseMessageService busDeliveredUseMessageService;
 
     private QueryWrapper<BusDeliveredApply> createQueryWrapper(BusDeliveredApplyQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
         if (query != null) {
             //合同编号
@@ -84,6 +82,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (StringUtils.isNotBlank(query.getName())) {
                 qw.eq("bd.name", query.getName());
             }
+            if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
+                qw.between("bd.applyName", query.getApplyDateStart(), query.getApplyDateEnd());
+            }
+            if (StringUtils.isNotBlank(query.getApplyName())) {
+                qw.eq("bd.applyName", query.getApplyName());
+            }
         }
         return qw;
     }