签卡管理，增加考勤时间查询

duty-service/src/main/java/cn/com/taiji/duty/model/DutySignInRecord.java

@@ -144,7 +144,7 @@ public class DutySignInRecord implements Serializable {
 	private Date updateTime;
 
 	/** 签卡配置时间 */
-	@ExcelProperty(value = "签卡时间",index =7)
+	@ExcelProperty(value = "考勤时间",index =7)
 	@ApiModelProperty("签卡配置时间")
 	@TableField("sign_time")
 	private String signTime;

duty-service/src/main/java/cn/com/taiji/duty/model/DutySignInRecordVo.java

@@ -81,6 +81,14 @@ public class DutySignInRecordVo implements Serializable {
 	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	private Date endTime;
 
+	/** 考勤开始时间 */
+	@ApiModelProperty("考勤开始时间")
+	private String beginSignTime;
+
+	/** 考勤结束时间 */
+	@ApiModelProperty("考勤结束时间")
+	private String endSignTime;
+
 	/** 页码 */
 	@ApiModelProperty("页码")
 	private Integer pageNum;

duty-service/src/main/resources/mapper/DutySignInRecordMapper.xml

@@ -58,6 +58,9 @@
                 <if test="vo.beginTime != null and vo.endTime != null">
                     and (time between DATE_FORMAT(#{vo.beginTime},'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(#{vo.endTime},'%Y-%m-%d %H:%i:%s'))
                 </if>
+                <if test="vo.beginSignTime != null and vo.endSignTime != null">
+                    and (sign_time between #{vo.beginSignTime} and #{vo.endSignTime})
+                </if>
                 <if test="vo.accountId != null">
                     and account_id = #{vo.accountId}
                 </if>
@@ -69,6 +72,7 @@
                     <foreach collection="vo.ids" open="(" separator="," close=")" item="item">
                         #{item}
                     </foreach>
+
                 </if>
             </if>
         </where>