优化考勤数据上报

java110-bean/src/main/java/com/java110/po/attendanceClassesTask/AttendanceClassesTaskPo.java

@@ -1,74 +1,90 @@
 package com.java110.po.attendanceClassesTask;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class AttendanceClassesTaskPo implements Serializable {
 
     private String classId;
-private String taskMonth;
-private String taskDay;
-private String statusCd = "0";
-private String state;
-private String storeId;
-private String taskYear;
-private String taskId;
-private String staffId;
-public String getClassId() {
+    private String taskMonth;
+    private String taskDay;
+    private String statusCd = "0";
+    private String state;
+    private String storeId;
+    private String taskYear;
+    private String taskId;
+    private String staffId;
+
+    public String getClassId() {
         return classId;
     }
-public void setClassId(String classId) {
+
+    public void setClassId(String classId) {
         this.classId = classId;
     }
-public String getTaskMonth() {
+
+    public String getTaskMonth() {
         return taskMonth;
     }
-public void setTaskMonth(String taskMonth) {
+
+    public void setTaskMonth(String taskMonth) {
         this.taskMonth = taskMonth;
     }
-public String getTaskDay() {
+
+    public String getTaskDay() {
         return taskDay;
     }
-public void setTaskDay(String taskDay) {
+
+    public void setTaskDay(String taskDay) {
         this.taskDay = taskDay;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getTaskYear() {
+
+    public String getTaskYear() {
         return taskYear;
     }
-public void setTaskYear(String taskYear) {
+
+    public void setTaskYear(String taskYear) {
         this.taskYear = taskYear;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
 
-
 }

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

@@ -15,6 +15,7 @@
  */
 package com.java110.common.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.bmo.attendanceClassesTask.IDeleteAttendanceClassesTaskBMO;
 import com.java110.common.bmo.attendanceClassesTask.IGetAttendanceClassesTaskBMO;
@@ -34,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @ClassName AttendanceClassApi
  * @Description 考勤相关处理API类
@@ -79,11 +82,15 @@ public class AttendanceClassApi {
     public ResponseEntity<String> saveAttendanceClassesTask(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "classId", "请求报文中未包含classId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+
+        JSONArray attendanceClassesTaskDetails = reqJson.getJSONArray("attendanceClassesTaskDetails");
+
+        List<AttendanceClassesTaskDetailPo> attendanceClassesTaskDetailPos
+                = JSONArray.parseArray(attendanceClassesTaskDetails.toJSONString(), AttendanceClassesTaskDetailPo.class);
 
 
         AttendanceClassesTaskPo attendanceClassesTaskPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesTaskPo.class);
-        return saveAttendanceClassesTaskBMOImpl.save(attendanceClassesTaskPo);
+        return saveAttendanceClassesTaskBMOImpl.save(attendanceClassesTaskPo,attendanceClassesTaskDetailPos);
     }
 
     /**

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/ISaveAttendanceClassesTaskBMO.java

@@ -1,7 +1,11 @@
 package com.java110.common.bmo.attendanceClassesTask;
 
 import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
+import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+
 public interface ISaveAttendanceClassesTaskBMO {
 
 
@@ -11,7 +15,8 @@ public interface ISaveAttendanceClassesTaskBMO {
      * @param attendanceClassesTaskPo
      * @return
      */
-    ResponseEntity<String> save(AttendanceClassesTaskPo attendanceClassesTaskPo);
+    ResponseEntity<String> save(AttendanceClassesTaskPo attendanceClassesTaskPo,
+                                List<AttendanceClassesTaskDetailPo> attendanceClassesTaskDetailPos);
 
 
 }

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/SaveAttendanceClassesTaskBMOImpl.java

@@ -3,19 +3,26 @@ package com.java110.common.bmo.attendanceClassesTask.impl;
 import com.java110.common.bmo.attendanceClassesTask.ISaveAttendanceClassesTaskBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
 import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
 import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
+import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("saveAttendanceClassesTaskBMOImpl")
 public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesTaskBMO {
 
     @Autowired
     private IAttendanceClassesTaskInnerServiceSMO attendanceClassesTaskInnerServiceSMOImpl;
 
+    @Autowired
+    private IAttendanceClassesTaskDetailInnerServiceSMO attendanceClassesTaskDetailInnerServiceSMOImpl;
+
     /**
      * 添加小区信息
      *
@@ -23,11 +30,16 @@ public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesT
      * @return 订单服务能够接受的报文
      */
     @Java110Transactional
-    public ResponseEntity<String> save(AttendanceClassesTaskPo attendanceClassesTaskPo) {
+    public ResponseEntity<String> save(AttendanceClassesTaskPo attendanceClassesTaskPo,
+                                       List<AttendanceClassesTaskDetailPo> attendanceClassesTaskDetailPos) {
 
-        attendanceClassesTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+        //attendanceClassesTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
         int flag = attendanceClassesTaskInnerServiceSMOImpl.saveAttendanceClassesTask(attendanceClassesTaskPo);
 
+        for(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo : attendanceClassesTaskDetailPos){
+            attendanceClassesTaskDetailInnerServiceSMOImpl.saveAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
+        }
+
         if (flag > 0) {
             return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }