签到人员统计，增加姓名和工号查询

common/src/main/resources/mapper/base/MeetingPerson.xml

@@ -107,15 +107,21 @@
     </select>
     <select id="search" parameterType="hashmap" resultMap="MeetingPersonMap">
         <![CDATA[
-			select * from base_meeting_person
+			select a.* from base_meeting_person a inner join base_person_info b on a.person_id = b.id_
 		]]>
         <where>
-            del_flag = false
+            a.del_flag = false and b.del_flag = false
             <if test="searchParams.meetingId != null">
-                and meetingInfo_id = #{searchParams.meetingId}
+                and a.meetingInfo_id = #{searchParams.meetingId}
+            </if>
+            <if test="searchParams.name != null">
+                and b.name_ like #{searchParams.name}
+            </if>
+            <if test="searchParams.jobNumber != null">
+                and b.job_number like #{searchParams.jobNumber}
             </if>
             <if test="searchParams.personIdList!=null">
-                <foreach collection="searchParams.personIdList" index="index" item="item" open=" and person_id not in ("
+                <foreach collection="searchParams.personIdList" index="index" item="item" open=" and a.person_id not in ("
                          separator="," close=")">
                     #{item}
                 </foreach>
@@ -129,12 +135,19 @@
         <![CDATA[
 			select a.*
 			FROM base_meeting_person a
+			inner join base_person_info b on a.person_id = b.id_
 		]]>
         <where>
-            a.del_flag=0 and a.sign_time is null
+            a.del_flag=0 and b.del_flag = 0 and a.sign_time is null
             <if test="searchParams.meetingId != null">
                 and a.meetingInfo_id = #{searchParams.meetingId}
             </if>
+            <if test="searchParams.name != null">
+                and b.name_ like #{searchParams.name}
+            </if>
+            <if test="searchParams.jobNumber != null">
+                and b.job_number like #{searchParams.jobNumber}
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}
@@ -145,12 +158,19 @@
         <![CDATA[
 			select a.person_id,a.sign_time
 			FROM base_meeting_person a
+			inner join base_person_info b on a.person_id = b.id_
 		]]>
         <where>
-            a.del_flag=0 and a.sign_time is not null
+            a.del_flag = 0 and b.del_flag = 0 and a.sign_time is not null
             <if test="searchParams.meetingId != null">
                 and a.meetingInfo_id = #{searchParams.meetingId}
             </if>
+            <if test="searchParams.name != null">
+                and b.name_ like #{searchParams.name}
+            </if>
+            <if test="searchParams.jobNumber != null">
+                and b.job_number like #{searchParams.jobNumber}
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}
@@ -161,12 +181,19 @@
         <![CDATA[
 			select a.person_id,a.sign_time
 			from base_meeting_person a
+			inner join base_person_info b on a.person_id = b.id_
 		]]>
         <where>
-            a.del_flag=0 and a.sign_type='2'
+            a.del_flag=0 and b.del_flag = 0 and a.sign_type='2'
             <if test="searchParams.meetingId != null">
                 and a.meetingInfo_id = #{searchParams.meetingId}
             </if>
+            <if test="searchParams.name != null">
+                and b.name_ like #{searchParams.name}
+            </if>
+            <if test="searchParams.jobNumber != null">
+                and b.job_number like #{searchParams.jobNumber}
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/MeetingPersonRecodeController.java

@@ -69,7 +69,7 @@ public class MeetingPersonRecodeController {
     @ApiOperation(value="应到列表")
     @RequestMapping(value = "shouldArriveList",method = RequestMethod.POST)
     public MessageResult<Map> shouldArriveList(
-            String meetingId,
+            String meetingId,String name,String jobNumber,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -83,12 +83,20 @@ public class MeetingPersonRecodeController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
         if (StringUtils.isNotEmpty(meetingId)) {
             searchParams.put("meetingId",meetingId);
         }
 
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%"+name+"%");
+        }
+
+        if (StringUtils.isNotEmpty(jobNumber)) {
+            searchParams.put("jobNumber",jobNumber+"%");
+        }
+
         Page<MeetingPerson> page = meetingPersonService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
         Page<MeetingPersonRecodeDTO> pageDto = new Page<>();
@@ -155,7 +163,7 @@ public class MeetingPersonRecodeController {
     @ApiOperation(value="实到列表")
     @RequestMapping(value = "realToList",method = RequestMethod.POST)
     public MessageResult<Map> realToList(
-            String meetingId,String type,
+            String meetingId,String type,String name,String jobNumber,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -171,12 +179,20 @@ public class MeetingPersonRecodeController {
             Map<String, Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("sign_time", "desc"));
+            sortList.add(new Sort("a.sign_time", "desc"));
 
             if (StringUtils.isNotEmpty(meetingId)) {
                 searchParams.put("meetingId", meetingId);
             }
 
+            if (StringUtils.isNotEmpty(name)) {
+                searchParams.put("name","%"+name+"%");
+            }
+
+            if (StringUtils.isNotEmpty(jobNumber)) {
+                searchParams.put("jobNumber",jobNumber+"%");
+            }
+
             Page<Map> page;
 
             if(type.equals("2")){
@@ -292,7 +308,7 @@ public class MeetingPersonRecodeController {
     @ApiOperation(value="缺席列表")
     @RequestMapping(value = "absentList",method = RequestMethod.POST)
     public MessageResult<Map> absentList(
-            String meetingId,
+            String meetingId,String name,String jobNumber,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -308,12 +324,20 @@ public class MeetingPersonRecodeController {
             Map<String, Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("sign_time", "desc"));
+            sortList.add(new Sort("a.sign_time", "desc"));
 
             if (StringUtils.isNotEmpty(meetingId)) {
                 searchParams.put("meetingId", meetingId);
             }
 
+            if (StringUtils.isNotEmpty(name)) {
+                searchParams.put("name","%"+name+"%");
+            }
+
+            if (StringUtils.isNotEmpty(jobNumber)) {
+                searchParams.put("jobNumber",jobNumber+"%");
+            }
+
             MeetingInfo meetingInfo = meetingInfoService.get(meetingId);
 
             Page<MeetingPersonRecodeDTO> pageDto = new Page<>();