提交

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

@@ -2671,17 +2671,29 @@ public class TimeCardController {
 	@Autowired
 	private KqglAssoRelationSummaryMapper kqglassorelationsummarymapper;
 	
-	@GetMapping(value = "/worktable_attendance_from")
+	@GetMapping(value = "/worktable_attendance_from/{date}")
 	@ApiOperation(value = "999:工作台考勤表格", httpMethod = "GET", notes = "查询数据")
-	public Result<Object> worktable_attendance_from(@CurrentUser UserBean userBean) throws ParseException {
+	public Result<Object> worktable_attendance_from(@CurrentUser UserBean userBean,@PathVariable("date") String date) throws ParseException {
 		
 		CalendarTableDataDto tabl = CalendarTableDataDto.builder().build();
 		
-		String belongyear = new SimpleDateFormat("yyyy").format(new Date());
-		String belongmonth = new SimpleDateFormat("MM").format(new Date());
+		String belongyear = null;
+		String belongmonth = null;
 		
+		String ttstr = null;//
+		
+		
+		
+		if(date == null || ("").equals(date)) {
+			belongyear = new SimpleDateFormat("yyyy").format(new Date());
+			belongmonth = new SimpleDateFormat("MM").format(new Date());
+			ttstr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
+		}else {
+			belongyear = date.substring(0, 4);
+			belongmonth = date.substring(5, 7);
+			ttstr = date;
+		}
 		
-		String ttstr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
 		
 		//1:加班 2:请假 3:出差 4:外出 5:补卡
 		KqglAssoRelationSummary sums = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 1, ttstr);