Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!132

src/main/java/cn/timer/api/bean/kqmk/KqglAssoBcsz.java

@@ -114,10 +114,10 @@ public class KqglAssoBcsz extends Model<KqglAssoBcsz> {
 	private Integer isXiuxi;
 	private Integer isXiuxi;
 
 
 	@ApiModelProperty(value = "休息开始时间 休息开始时间", example = "101")
 	@ApiModelProperty(value = "休息开始时间 休息开始时间", example = "101")
-	private Long startTime;
+	private String startTime;
 
 
 	@ApiModelProperty(value = "休息结束时间 休息结束时间", example = "101")
 	@ApiModelProperty(value = "休息结束时间 休息结束时间", example = "101")
-	private Long endTime;
+	private String endTime;
 
 
 	@ApiModelProperty(value = "上下班次数(1/2/3  最大值为3)", example = "101")
 	@ApiModelProperty(value = "上下班次数(1/2/3  最大值为3)", example = "101")
 	private Integer sxbcs;
 	private Integer sxbcs;

src/main/java/cn/timer/api/dao/kqgl/PunchRecordMapper.java

@@ -2,8 +2,13 @@ package cn.timer.api.dao.kqgl;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import cn.timer.api.bean.kqgl.AttendanceDetails;
 import cn.timer.api.bean.kqgl.AttendanceDetails;
 import cn.timer.api.bean.kqgl.PunchRecord;
 import cn.timer.api.bean.kqgl.PunchRecord;
+import cn.timer.api.dto.kqmk.OriginalRecordDto;
 
 
 public interface PunchRecordMapper {
 public interface PunchRecordMapper {
     int deleteByPrimaryKey(Integer id);
     int deleteByPrimaryKey(Integer id);
@@ -31,4 +36,8 @@ public interface PunchRecordMapper {
     List<PunchRecord> getMaintenancePunchCardList(Long start,Long end,Integer userId);
     List<PunchRecord> getMaintenancePunchCardList(Long start,Long end,Integer userId);
     
     
     List<PunchRecord> selFuzzyOriginalAttendance(AttendanceDetails attendancedetails);
     List<PunchRecord> selFuzzyOriginalAttendance(AttendanceDetails attendancedetails);
+    
+    
+    
+    IPage<PunchRecord> QueryOriginalRecord(IPage<PunchRecord> page,@Param("param") OriginalRecordDto originalrecorddto);
 }
 }
\ No newline at end of file

src/main/java/cn/timer/api/dto/kqmk/OriginalRecordDto.java

+package cn.timer.api.dto.kqmk;
+
+import cn.timer.api.utils.Page;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OriginalRecordDto extends Page {
+	
+	private Integer qyid;
+	
+	private String start;
+	
+	private String end;
+	
+	private String text;
+
+}

src/main/resources/mapping/kqgl/PunchRecordMapper.xml

@@ -32,6 +32,32 @@
     id, dktime, lon, lat, address, results, user_id, type, status, sort, card_type, macname, 
     id, dktime, lon, lat, address, results, user_id, type, status, sort, card_type, macname, 
     mac, qyid, attdate, attime, dkmxid,bcid,remarks,punchmode,punchequipment
     mac, qyid, attdate, attime, dkmxid,bcid,remarks,punchmode,punchequipment
   </sql>
   </sql>
+  
+  <select id="QueryOriginalRecord" resultMap="BaseResultMap">
+  		select dkjl.*,
+  		bmgw.dept,
+			 bmgw.post,
+			info.`name` username 
+		from kqgl_asso_dkjl dkjl
+		LEFT JOIN yggl_main_emp as info on info.emp_num = dkjl.user_id
+		LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
+				 from zzgl_bmgw_m m 
+				 left join zzgl_bmgw_m um on um.id = m.up_id  
+			) as bmgw on bmgw.mid = info.bmgw_id
+		where dkjl.qyid = #{param.qyid}
+		<if test="param.start != ''" >
+			and dkjl.attime &gt;= #{param.start}
+		</if>
+		<if test="param.end != ''" >
+			and dkjl.attime &lt;= #{param.end}
+		</if>
+		<if test="param.text != null and param.text != ''" >
+			and (info.`name` like CONCAT('%',#{param.text},'%') or info.emp_num = #{param.text})
+		</if>
+		ORDER BY dkjl.id ASC
+  </select>
+  
+  
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />