打卡记录添加工号查询

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

@@ -141,6 +141,7 @@
 			c.phone_ as person_phone_,
 			c.id_card as person_id_card,
 			c.open_id as person_open_id,
+			c.job_number as person_job_number,
 			c.position1_ as person_position1_,
 			c.position2_ as person_position2_,
 	        c.position3_ as person_position3_,
@@ -248,6 +249,11 @@
                     GROUP BY person_id
                 )
             </if>
+            <if test="searchParams.jobNumbers!=null">
+                <foreach collection="searchParams.jobNumbers" item="item" open="and c.job_number in(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/PersonDeviceLogController.java

@@ -84,6 +84,7 @@ public class PersonDeviceLogController {
             @ApiImplicitParam(name = "aliasName", value = "设备别名", paramType = "query"),
             @ApiImplicitParam(name = "personId", value = "人员编号", paramType = "query"),
             @ApiImplicitParam(name = "personName", value = "人员姓名", paramType = "query"),
+            @ApiImplicitParam(name = "jobNumbers", value = "工号", paramType = "query"),
             @ApiImplicitParam(name = "timeRanges", value = "时间范围", paramType = "query"),
             @ApiImplicitParam(name = "temperatureRanges", value = "温度范围", paramType = "query"),
             @ApiImplicitParam(name = "matchMsg", value = "匹配状态", paramType = "query"),
@@ -92,7 +93,7 @@ public class PersonDeviceLogController {
     public MessageResult<Map> pageList(
             String companyId,
             @RequestParam(value = "subordinate", defaultValue = "false") Boolean subordinate,
-            String deviceNo, String aliasName, String personId,String personName,
+            String deviceNo, String aliasName, String personId,String personName,String jobNumbers,
             String timeRanges, String temperatureRanges, String matchMsg,
             @RequestParam(value = "distinct", defaultValue = "false") Boolean distinct,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
@@ -185,6 +186,11 @@ public class PersonDeviceLogController {
             searchParams.put("personName", "%" + personName + "%");
         }
 
+        if (StringUtil.isNotEmpty(jobNumbers)) {
+            String[] jobNumbersArray = jobNumbers.split(",");
+            searchParams.put("jobNumbers", Arrays.asList(jobNumbersArray));
+        }
+
         if (StringUtil.isNotEmpty(matchMsg)) {
             searchParams.put("matchMsg", matchMsg);
         }