优化今日考勤代码

java110-bean/src/main/java/com/java110/dto/attendanceClassesTask/AttendanceClassesTaskDto.java

@@ -21,6 +21,7 @@ public class AttendanceClassesTaskDto extends PageDto implements Serializable {
     private String taskMonth;
     private String taskDay;
     private String state;
+    private String stateName;
     private String storeId;
     private String taskYear;
     private String taskId;
@@ -149,4 +150,12 @@ public class AttendanceClassesTaskDto extends PageDto implements Serializable {
     public void setAttendanceClassesTaskDetails(List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetails) {
         this.attendanceClassesTaskDetails = attendanceClassesTaskDetails;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/common/AttendanceClassesTaskServiceDaoImplMapper.xml

@@ -19,9 +19,11 @@
     <select id="getAttendanceClassesTaskInfo" parameterType="Map" resultType="Map">
         select t.class_id,t.class_id classId,t.task_month,t.task_month taskMonth,t.task_day,t.task_day
         taskDay,t.status_cd,t.status_cd statusCd,t.state,t.store_id,t.store_id storeId,t.task_year,t.task_year
-        taskYear,t.task_id,t.task_id taskId,t.staff_id,t.staff_id staffId,ac.classes_name classesName,ac.classes_obj_name classObjName
+        taskYear,t.task_id,t.task_id taskId,t.staff_id,t.staff_id staffId,ac.classes_name classesName,ac.classes_obj_name classObjName,
+        td.name stateName
         from attendance_classes_task t
         LEFT JOIN attendance_classes ac on t.class_id = ac.classes_id and ac.status_cd = '0'
+        left join t_dict td on td.table_name = 'attendance_classes_task' and td.table_columns = 'state' and t.state = td.status_cd
         where 1 =1
         <if test="classId !=null and classId != ''">
             and t.class_id= #{classId}

service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java

@@ -31,10 +31,19 @@ import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -90,7 +99,7 @@ public class AttendanceClassApi {
 
 
         AttendanceClassesTaskPo attendanceClassesTaskPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesTaskPo.class);
-        return saveAttendanceClassesTaskBMOImpl.save(attendanceClassesTaskPo,attendanceClassesTaskDetailPos);
+        return saveAttendanceClassesTaskBMOImpl.save(attendanceClassesTaskPo, attendanceClassesTaskDetailPos);
     }
 
     /**
@@ -143,11 +152,24 @@ public class AttendanceClassApi {
     @RequestMapping(value = "/queryAttendanceClassesTask", method = RequestMethod.GET)
     public ResponseEntity<String> queryAttendanceClassesTask(@RequestHeader(value = "store-id") String storeId,
                                                              @RequestParam(value = "page") int page,
-                                                             @RequestParam(value = "row") int row) {
+                                                             @RequestParam(value = "row") int row,
+                                                             @RequestParam(value = "classId", required = false) String classId,
+                                                             @RequestParam(value = "staffId", required = false) String staffId,
+                                                             @RequestParam(name = "date", required = false) String date) throws Exception {
         AttendanceClassesTaskDto attendanceClassesTaskDto = new AttendanceClassesTaskDto();
         attendanceClassesTaskDto.setPage(page);
         attendanceClassesTaskDto.setRow(row);
         attendanceClassesTaskDto.setStoreId(storeId);
+        attendanceClassesTaskDto.setClassId(classId);
+        if (!StringUtil.isEmpty(date)) {
+            Date reqDate = DateUtil.getDateFromString(date, DateUtil.DATE_FORMATE_STRING_B);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(reqDate);
+            attendanceClassesTaskDto.setTaskYear(calendar.get(Calendar.YEAR) + "");
+            attendanceClassesTaskDto.setTaskMonth((calendar.get(Calendar.MONTH) + 1) + "");
+            attendanceClassesTaskDto.setTaskDay(calendar.get(Calendar.DAY_OF_MONTH) + "");
+        }
         return getAttendanceClassesTaskBMOImpl.get(attendanceClassesTaskDto);
     }
 
@@ -187,13 +209,13 @@ public class AttendanceClassApi {
 
         boolean finishAllTaskDetail = false;
 
-        if(reqJson.containsKey("finishAllTaskDetail") && reqJson.getBoolean("finishAllTaskDetail")){
+        if (reqJson.containsKey("finishAllTaskDetail") && reqJson.getBoolean("finishAllTaskDetail")) {
             finishAllTaskDetail = true;
         }
 
 
         AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesTaskDetailPo.class);
-        return updateAttendanceClassesTaskDetailBMOImpl.update(attendanceClassesTaskDetailPo,finishAllTaskDetail);
+        return updateAttendanceClassesTaskDetailBMOImpl.update(attendanceClassesTaskDetailPo, finishAllTaskDetail);
     }
 
     /**