提交

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -2757,32 +2757,22 @@ public class TimeCardController {
 			ttstr = date;
 			ttstr = date;
 		}
 		}
 		//1:加班 2:请假 3:出差 4:外出 5:补卡
 		//1:加班 2:请假 3:出差 4:外出 5:补卡
-		KqglAssoRelationSummary sums = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 1, ttstr);
 		KqglAssoRelationSummary qjj = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 2, ttstr);
 		KqglAssoRelationSummary qjj = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 2, ttstr);
-		KqglAssoRelationSummary cxx = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 3, ttstr);
 		
 		
 		KqglAssoMonthPunchSummary punsum = KqglAssoMonthPunchSummary.builder().build().selectOne(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getNum, userBean.getEmpNum())
 		KqglAssoMonthPunchSummary punsum = KqglAssoMonthPunchSummary.builder().build().selectOne(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getNum, userBean.getEmpNum())
 				.eq(KqglAssoMonthPunchSummary::getOrgCode, userBean.getOrgCode()).eq(KqglAssoMonthPunchSummary::getBelongYear, belongyear).eq(KqglAssoMonthPunchSummary::getBelongMonth, belongmonth));
 				.eq(KqglAssoMonthPunchSummary::getOrgCode, userBean.getOrgCode()).eq(KqglAssoMonthPunchSummary::getBelongYear, belongyear).eq(KqglAssoMonthPunchSummary::getBelongMonth, belongmonth));
 		
 		
-		
 		BalanceSheetDataDto empye = kqglassomonthpunchsummarymapper.FormMonthlySummaryLeave(userBean.getOrgCode(), userBean.getEmpNum(), ttstr);
 		BalanceSheetDataDto empye = kqglassomonthpunchsummarymapper.FormMonthlySummaryLeave(userBean.getOrgCode(), userBean.getEmpNum(), ttstr);
 		
 		
-		
 		tabl.setAttendance(punsum == null ? "" : String.valueOf(punsum.getDaysOnDuty()));// 应出勤
 		tabl.setAttendance(punsum == null ? "" : String.valueOf(punsum.getDaysOnDuty()));// 应出勤
 		tabl.setAttended(punsum == null ? "" : String.valueOf(punsum.getActualAttDays()));// 已出勤
 		tabl.setAttended(punsum == null ? "" : String.valueOf(punsum.getActualAttDays()));// 已出勤
-		
 		tabl.setLeave(qjj == null ? "" : String.valueOf(empye.getBalancedays()));// 请假*******************
 		tabl.setLeave(qjj == null ? "" : String.valueOf(empye.getBalancedays()));// 请假*******************
-		
 		tabl.setLackworkcard(punsum == null ? "" : String.valueOf(punsum.getNumberWorkCardShortage()));// 上班缺卡
 		tabl.setLackworkcard(punsum == null ? "" : String.valueOf(punsum.getNumberWorkCardShortage()));// 上班缺卡
-		
-//		tabl.setWorkovertime(sums == null ? "" : String.valueOf(sums.getDuration()));// 加班
-		tabl.setWorkovertime(sums == null ? "" : String.valueOf(punsum.getTotalOvertimeHours()));// 加班
-		tabl.setCompensatoryleave(String.valueOf(punsum.getDaysOff()));// 休息天数
-//		tabl.setEvection(cxx == null ? "" : String.valueOf(cxx.getDuration()));// 出差
-		tabl.setEvection(cxx == null ? "" : String.valueOf(punsum.getLengthBusinessTrip()));// 出差
+		tabl.setWorkovertime(punsum == null ? "" : String.valueOf(punsum.getTotalOvertimeHours()));// 加班
+		tabl.setCompensatoryleave(punsum == null ? "" : String.valueOf(punsum.getDaysOff()));// 休息天数
+		tabl.setEvection(punsum == null ? "" : String.valueOf(punsum.getLengthBusinessTrip()));// 出差
 		tabl.setOffdutycardshortage(punsum == null ? "" : String.valueOf(punsum.getNumberDutyCardShortage()));// 下班缺卡
 		tabl.setOffdutycardshortage(punsum == null ? "" : String.valueOf(punsum.getNumberDutyCardShortage()));// 下班缺卡
 		
 		
-		
 		return ResultUtil.data(tabl, "操作成功!");
 		return ResultUtil.data(tabl, "操作成功!");
 	}
 	}
 	
 	

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

@@ -161,8 +161,17 @@
 			</if>
 			</if>
 			
 			
 			<if test="param.sts != null">
 			<if test="param.sts != null">
-        	and a.sts = #{param.sts}
+				<if test="param.sts == 5">
+	        		and a.sts in (0,1,2,3)
+				</if>
+				<if test="param.sts == 4">
+	        		and a.sts in (2,3)
+				</if>
+				<if test="param.sts != 4 and param.sts != 5">
+					and a.sts = #{param.sts}
+				</if>
 			</if>
 			</if>
+			
 
 
         	<if test="param.query != null and param.query != ''">
         	<if test="param.query != null and param.query != ''">
         		and (
         		and (