优化代码

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

@@ -53,7 +53,7 @@
         </if>
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
-        </if>reportFeeMonthStatistics
+        </if>
         <if test="taskIds != null">
             and t.task_id in
             <foreach collection="taskIds" item="item" open="(" close=")" separator=",">

java110-interface/src/main/java/com/java110/intf/report/IAttendanceInnerServiceSMO.java

@@ -0,0 +1,50 @@
+package com.java110.intf.report;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
+import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IReportFeeMonthStatisticsInnerServiceSMO
+ * @Description 费用月统计接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "report-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/attendanceInnerServiceApi")
+public interface IAttendanceInnerServiceSMO {
+
+
+
+    /**
+     * <p>查询月考勤数量</p>
+     *
+     *
+     * @param attendanceClassesTaskDto 数据对象分享
+     * @return FeeConfigDto 对象数据
+     */
+    @RequestMapping(value = "/getMonthAttendanceCount", method = RequestMethod.POST)
+    long getMonthAttendanceCount(@RequestBody AttendanceClassesTaskDto attendanceClassesTaskDto);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param attendanceClassesTaskDto 数据对象分享
+     * @return FeeConfigDto 对象数据
+     */
+    @RequestMapping(value = "/getMonthAttendance", method = RequestMethod.POST)
+    List<FeeConfigDto> getMonthAttendance(@RequestBody AttendanceClassesTaskDto attendanceClassesTaskDto);
+
+}

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

@@ -35,12 +35,7 @@ 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.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 org.springframework.web.bind.annotation.*;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -256,4 +251,38 @@ public class AttendanceClassApi {
         return getAttendanceClassesTaskDetailBMOImpl.get(attendanceClassesTaskDetailDto);
     }
 
+    /**
+     * 添加设备接口类
+     *
+     * @return 成功或者失败
+     * @throws Exception
+     */
+    @RequestMapping(path = "/getMonthAttendance", method = RequestMethod.GET)
+    public ResponseEntity<String> getMonthAttendance(
+            @RequestHeader(value = "store-id") String storeId,
+            @RequestParam int page,
+            @RequestParam int row,
+            @RequestParam(name = "classesId", required = false) String classesId,
+            @RequestParam(name = "staffName", required = false) String staffName,
+            @RequestParam(name = "date", required = false) String date,
+            @RequestParam(name = "departmentId", required = false) String departmentId
+    ) throws Exception {
+
+        AttendanceClassesTaskDto attendanceClassesTaskDto = new AttendanceClassesTaskDto();
+        attendanceClassesTaskDto.setPage(page);
+        attendanceClassesTaskDto.setRow(row);
+        attendanceClassesTaskDto.setClassId(classesId);
+        attendanceClassesTaskDto.setStaffName(staffName);
+        attendanceClassesTaskDto.setStoreId(storeId);
+
+        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) + "");
+        }
+        return  getAttendanceClassesTaskDetailBMOImpl.getMonthAttendance(attendanceClassesTaskDto);
+    }
+
 }

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/IGetAttendanceClassesTaskDetailBMO.java

@@ -1,16 +1,28 @@
 package com.java110.common.bmo.attendanceClassesTaskDetail;
+
+import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
 import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
 import org.springframework.http.ResponseEntity;
+
 public interface IGetAttendanceClassesTaskDetailBMO {
 
 
     /**
      * 查询考勤任务明细
      * add by wuxw
-     * @param  attendanceClassesTaskDetailDto
+     *
+     * @param attendanceClassesTaskDetailDto
      * @return
      */
     ResponseEntity<String> get(AttendanceClassesTaskDetailDto attendanceClassesTaskDetailDto);
 
 
+    /**
+     * 查询月考勤
+     * add by wuxw
+     *
+     * @param attendanceClassesTaskDto
+     * @return
+     */
+    ResponseEntity<String> getMonthAttendance(AttendanceClassesTaskDto attendanceClassesTaskDto);
 }

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.common.bmo.attendanceClassesTaskDetail.impl;
 
 import com.java110.common.bmo.attendanceClassesTaskDetail.IGetAttendanceClassesTaskDetailBMO;
+import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
 import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
 import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
 import com.java110.vo.ResultVo;
@@ -41,4 +42,9 @@ public class GetAttendanceClassesTaskDetailBMOImpl implements IGetAttendanceClas
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> getMonthAttendance(AttendanceClassesTaskDto attendanceClassesTaskDto) {
+        return null;
+    }
+
 }