结算搜索查询

conf/db.properties

@@ -1,12 +1,12 @@
 # 数据库服务器配置
 type=com.alibaba.druid.pool.DruidDataSource
 druid.driver-class=com.mysql.cj.jdbc.Driver
-#druid.url=jdbc:mysql://10.14.1.197:3306/jiao_api_alpha_x?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-#druid.username=jiao_api_alpha_x
-#druid.password=YcpfGJyJpy6KfYR3
-druid.url=jdbc:mysql://localhost:3306/szwhtrans?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-druid.username=root
-druid.password=xc1123
+druid.url=jdbc:mysql://10.14.1.197:3306/jiao_api_alpha_x?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+druid.username=jiao_api_alpha_x
+druid.password=YcpfGJyJpy6KfYR3
+#druid.url=jdbc:mysql://localhost:3306/szwhtrans?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#druid.username=root
+#druid.password=xc1123
 druid.initial-size=10
 druid.max-active=100
 druid.min-idle=10

src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java

@@ -36,7 +36,7 @@ public class AdminAccountCloseController extends BaseController {
         // 结算人
         String userName=request.getParameter("user_name");
         if(StringUtils.isNotBlank(userName)){
-            qmap.put("user_name",userName);
+            qmap.put("u.name",userName);
         }
         //结算账户
         String closeAccount=request.getParameter("close_account");
@@ -46,12 +46,12 @@ public class AdminAccountCloseController extends BaseController {
         //银行卡号
         String bankAccount= request.getParameter("bank_account");
         if(StringUtils.isNotBlank(bankAccount)){
-            qmap.put("bank_account",bankAccount);
+            qmap.put("u.publicAccount",bankAccount);
         }
         //状态
         String status =request.getParameter("status");
         if(StringUtils.isNotBlank(status)){
-            qmap.put("status",status);
+            qmap.put("o.close_status",status);
         }
 
         // 类型

src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java

@@ -34,5 +34,5 @@ public interface OrderUserMapper {
      * 订单结算
      * @return
      */
-    List<SettleVo> ordercs();
+    List<SettleVo> ordercs(@Param("map") Map map);
 }

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -95,15 +95,8 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         retmap.put("page",page);
         retmap.put("per_page",limit);
         // 按照用户isli 分组
-        String query=""; //附加查询条件
 
-        // 组装查询条件
-        if(qmap!=null){
-            //for(Map.Entry<String,String> mp:qmap.entrySet()){
-
-            //}
-        }
-        List<SettleVo> xlist = orderUserMapper.ordercs();
+        List<SettleVo> xlist = orderUserMapper.ordercs(qmap);
         retmap.put("data",xlist);
         return retmap;
     }

src/main/resources/mapper/szwh/OrderUserMapper.xml

@@ -28,11 +28,23 @@
     </select>
 
     <!-- 订单结算 -->
-    <select id="ordercs" resultType="cn.chjyj.szwh.vo.SettleVo">
+    <select id="ordercs" resultType="cn.chjyj.szwh.vo.SettleVo" parameterType="java.util.Map">
     SELECT u.islicode as islicode,u.`name`,u.publicAccount,
     u.bankName,u.userType,o.close_status FROM order_user u
     INNER JOIN `order` o ON u.batchcode=o.batchcode
-    WHERE u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+    WHERE
+      <if test="map!=null">
+          <foreach collection="map" item="v" index="k" separator="and">
+              <if test="v != null and v != '' and k!='u.name'">
+                  ${k} = #{v}
+              </if>
+              <if test="k=='u.name'">
+                  u.`name` like CONCAT('%',${v},'%')
+              </if>
+          </foreach>
+          AND
+      </if>
+     u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
     ORDER BY u.id DESC
     </select>
 

src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,7 +39,9 @@ public class OrderUserMapperTest {
 
     @Test
     public void ordcs(){
-        List<SettleVo> xxlist = orderUserMapper.ordercs();
+        Map query = new HashMap();
+        query.put("name","测试");
+        List<SettleVo> xxlist = orderUserMapper.ordercs(query);
         for(SettleVo sl:xxlist){
             System.out.println(sl.getBankName());
         }