修改BUG377 员工自定义工号功能无效 每日统计页，调整

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

@@ -16,6 +16,7 @@ public class DailyDetailsDto {
 
 
 	private String name;// 姓名
 	private String name;// 姓名
 	private Integer num;// 工号
 	private Integer num;// 工号
+	private String customNum;// 工号
 	private String dept;// 部门
 	private String dept;// 部门
 	private String post;// 岗位
 	private String post;// 岗位
 	private Integer orgcode;// 岗位
 	private Integer orgcode;// 岗位

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -152,6 +152,7 @@
     <resultMap id="DailyDetailsMap" type="cn.timer.api.dto.kqmk.DailyDetailsDto" >
     <resultMap id="DailyDetailsMap" type="cn.timer.api.dto.kqmk.DailyDetailsDto" >
                 <result column="name" property="name" />
                 <result column="name" property="name" />
 				<result column="num" property="num" />
 				<result column="num" property="num" />
+				<result column="custom_num" property="customNum" />
                 <result column="dept" property="dept" />
                 <result column="dept" property="dept" />
                 <result column="post" property="post" />
                 <result column="post" property="post" />
                 <result column="orgcode" property="orgcode" />
                 <result column="orgcode" property="orgcode" />
@@ -314,6 +315,7 @@
 
 
 	<select id="Dailydetails" resultMap="DailyDetailsMap">
 	<select id="Dailydetails" resultMap="DailyDetailsMap">
 				select sum.num,
 				select sum.num,
+					info.custom_num,
 					sum.`name`,
 					sum.`name`,
 					sum.org_code as orgcode,
 					sum.org_code as orgcode,
 					sum.dept,sum.post,
 					sum.dept,sum.post,
@@ -484,7 +486,7 @@
 						bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3,
 						bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3,
 						dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` ,
 						dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` ,
 						dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` ,
 						dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` ,
-						dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6,dkmx.dkst1,dkmx.dkst2,dkmx.dkst3
+						dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6,dkmx.dkst1,dkmx.dkst2,dkmx.dkst3,info.custom_num
 					from kqgl_asso_dkmx dkmx 
 					from kqgl_asso_dkmx dkmx 
 					LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
 					LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
 					LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
 					LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
@@ -492,13 +494,15 @@
 						where dkmx.qyid = #{param.orgCode}
 						where dkmx.qyid = #{param.orgCode}
 					and dkmx.`data` = #{param.times}
 					and dkmx.`data` = #{param.times}
 			) as rtj on rtj.userid = sum.num
 			) as rtj on rtj.userid = sum.num
+			LEFT JOIN yggl_main_emp as info on info.emp_num = sum.num and info.org_code = #{param.orgCode}
 			
 			
 			where sum.org_code = #{param.orgCode}
 			where sum.org_code = #{param.orgCode}
 			and sum.belong_year = #{param.year}
 			and sum.belong_year = #{param.year}
 			and sum.belong_month = #{param.month}
 			and sum.belong_month = #{param.month}
 			<if test="param.query != null and param.query != ''">
 			<if test="param.query != null and param.query != ''">
 				and (	sum.`name` like CONCAT('%',#{param.query},'%') or 
 				and (	sum.`name` like CONCAT('%',#{param.query},'%') or 
-						sum.num like CONCAT('%',#{param.query},'%'))
+						sum.num like CONCAT('%',#{param.query},'%') or
+				info.custom_num like CONCAT('%',#{param.query},'%'))
 			</if>
 			</if>
 			<if test="param.attid != null and param.attid != ''">
 			<if test="param.attid != null and param.attid != ''">
 				and sum.att_group = #{param.attid}
 				and sum.att_group = #{param.attid}