Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!333

src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml

@@ -149,8 +149,11 @@
 				 FROM 
 				 	spmk_executor 
 				 WHERE 
-				 	emp_num = #{param.empNum}) 
-				 
+				 	emp_num = #{param.empNum}
+				 	<if test="param.sts == 0">
+					 	and sts not in (2,3,4)
+					</if>
+				 	) 
 				 <if test="param.type == 3">
 				 	and type in (0,1,2)
 				 </if>