修改添加回访记录

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -306,4 +306,11 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<OrderByTypeExportDto> getOrderByMonthAndType(@Param("organIds") String organIds,
                                                       @Param("orderTypeList") List<OrderTypeEnum> orderTypeList,
                                                       @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     * 搜索用户
+     * @param search
+     * @return
+     */
+    List<BasicUserDto> getUsers(@Param("search") String search);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -4,6 +4,7 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class StudentPaymentOrderQueryInfo extends QueryInfo {
 
@@ -52,6 +53,8 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "商户订单号",required = false)
     private String transNo;
 
+    private List<Integer> userIds;
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -181,4 +184,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setTransNo(String transNo) {
         this.transNo = transNo;
     }
+
+    public List<Integer> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<Integer> userIds) {
+        this.userIds = userIds;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -204,6 +204,12 @@
 
     <sql id="queryPaymentOrder">
         <where>
+            <if test="search != null">
+                AND spo.user_id_ IN
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(spo.organ_id_,#{organId})
             </if>
@@ -687,4 +693,9 @@
         ]]></if>
         AND spo.actual_amount_ > 0
     </select>
+
+    <select id="getUsers" resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
+            SELECT username_,id_ user_id_,phone_ FROM sys_user
+            WHERE id_ = #{search} OR username_ LIKE CONCAT('%',#{search},'%') OR phone_ LIKE CONCAT('%',#{search},'%')
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -110,6 +110,12 @@
 
     <sql id="queryPaymentOrder">
         <where>
+            <if test="search != null">
+                AND spo.user_id_ IN
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(spo.organ_id_,#{organId})
             </if>

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -810,6 +810,13 @@ public class ExportController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
+        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
+            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
+            if(userIds.size() >0){
+                queryInfo.setUserIds(userIds);
+            }
+        }
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         queryInfo.setIsExport(true);
@@ -1869,6 +1876,13 @@ public class ExportController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
+        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
+            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
+            if(userIds.size() >0){
+                queryInfo.setUserIds(userIds);
+            }
+        }
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         queryInfo.setIsExport(true);

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -3,7 +3,9 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
@@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RequestMapping("order")
 @Api(tags = "订单服务")
@@ -44,6 +47,8 @@ public class StudentPaymentOrderController extends BaseController {
     private EmployeeDao employeeDao;
     @Autowired
     private SysConfigDao sysConfigDao;
+    @Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
 
     @ApiOperation(value = "获取订单列表")
     @GetMapping("/queryPage")
@@ -66,6 +71,13 @@ public class StudentPaymentOrderController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
+            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
+            if(userIds.size() >0){
+                queryInfo.setUserIds(userIds);
+            }
+        }
 
         PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -3,7 +3,9 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RequestMapping("routeOrder")
 @Api(tags = "分润订单服务")
@@ -42,6 +45,8 @@ public class StudentPaymentRouteOrderController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
 
     @ApiOperation(value = "财务订单列表")
     @GetMapping("/finance")
@@ -64,6 +69,13 @@ public class StudentPaymentRouteOrderController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
+            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
+            if(userIds.size() >0){
+                queryInfo.setUserIds(userIds);
+            }
+        }
 
         PageInfo<StudentPaymentRouteOrderDto> studentPaymentRouteOrderPageInfo = studentPaymentRouteOrderService.OrderQueryPage(queryInfo);
         return succeed(studentPaymentRouteOrderPageInfo);