乘客 班次

common/src/main/java/com/jpsoft/bus/modules/bus/entity/PassengerInfo.java

@@ -56,4 +56,8 @@ public class PassengerInfo {
     private Date updateTime;
         @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+
+    @ApiModelProperty(value = "注册用户名")
+    private String userName;
+
 }

common/src/main/resources/mapper/bus/PassengerInfo.xml

@@ -20,6 +20,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="userName" column="user_name" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.PassengerInfo">
 	<!--
@@ -116,12 +117,29 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="PassengerInfoMap">
 		<![CDATA[
-			select * from bus_passenger_info
+			SELECT
+				a.* ,
+				b.name_ as user_name
+			FROM
+				bus_passenger_info a
+				LEFT JOIN bus_user_info b ON a.user_id = b.id_
 		]]>
 		<where>
-			del_flag = 0
+			a.del_flag = 0
 			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+				and a.ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.vehiclePersonId != null">
+				and a.vehicle_person_id = #{searchParams.vehiclePersonId}
+			</if>
+			<if test="searchParams.userId != null">
+				and a.user_id = #{searchParams.userId
+			</if>
+			<if test="searchParams.userName != null">
+				and b.name_ like #{searchParams.userName}
+			</if>
+			<if test="searchParams.payStatus != null">
+				and a.pay_status = #{searchParams.payStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/bus/modules/bus/controller/CompanyInfoController.java

@@ -265,8 +265,10 @@ public class CompanyInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String name,String parentId,Boolean subordinate,
-            String type,
+            @RequestParam(value="name",defaultValue="") String name,
+            @RequestParam(value="parentId",defaultValue="") String parentId,
+            @RequestParam(value="type",defaultValue="") String type,
+            @RequestParam(value="subordinate",defaultValue="false") Boolean subordinate,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){

web/src/main/java/com/jpsoft/bus/modules/bus/controller/PassengerInfoController.java

@@ -200,7 +200,9 @@ public class PassengerInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            @RequestParam(value="vehiclePersonId",defaultValue="") String vehiclePersonId,
+            @RequestParam(value="userName",defaultValue="") String userName,
+            @RequestParam(value="payStatus",defaultValue="") String payStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -213,10 +215,18 @@ public class PassengerInfoController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(vehiclePersonId)) {
+            searchParams.put("vehiclePersonId",Long.valueOf(vehiclePersonId));
+        }
+
+        if (StringUtils.isNotEmpty(userName)) {
+            searchParams.put("userName","%" + userName + "%");
+        }
+
+        if (StringUtils.isNotEmpty(payStatus)) {
+            searchParams.put("payStatus",payStatus);
         }
 
         Page<PassengerInfo> page = passengerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);