考勤汇总bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -288,7 +288,6 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         attendanceStatEntity.setId(temp.getId());
                         attendanceStatEntity.setUpdateTime(new Date());
                         updateList.add(attendanceStatEntity);
-                        updateList.add(temp);
                     }
                 }
                 if(insertList.size()>0){

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml

@@ -17,30 +17,29 @@
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%m') as `month`,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%d') as `day`,
-            IFNULL(b.personalLeaveDays,0) as personalLeaveDays,
-            IFNULL(b.compensatedLeaveDays,0) as compensatedLeaveDays,
-            IFNULL(b.sickLeaveDays,0) as sickLeaveDays,
-            IFNULL(b.annualLeaveDays,0) as annualLeaveDays,
-            IFNULL(b.marriageLeaveDays,0) as marriageLeaveDays,
-            IFNULL(b.maternityLeaveDays,0) as maternityLeaveDays,
-            IFNULL(b.paternityLeaveDays,0) as paternityLeaveDays,
-            IFNULL(b.menstrualLeaveDays,0) as menstrualLeaveDays,
-            IFNULL(b.breastfeedingLeaveDays,0) as breastfeedingLeaveDays,
-            IFNULL(b.bereavementLeaveDays,0) as bereavementLeaveDays,
-            IFNULL(b.backToUnit,0) as backToUnit,
-            IFNULL(b.onDutyLeave,0) as onDutyLeave,
-            IFNULL(b.outOfOffice,0) as outOfOffice,
-            IFNULL(b.shiftCompensation,0) as shiftCompensation,
-            IFNULL(b.physicalExamination,0) as physicalExamination,
-            IFNULL(b.quarantine,0) as quarantine,
-            IFNULL(b.businessTrip,0) as businessTrip,
-            IFNULL(b.publicHoliday,0) as publicHoliday,
-            IFNULL(b.childRearingLeave,0) as childRearingLeave,
-            IFNULL(b.transferBack,0) as transferBack,
-            IFNULL(b.homeLeave,0) as homeLeave
+            0 as personalLeaveDays,
+            0 as compensatedLeaveDays,
+            0 as sickLeaveDays,
+            0 as annualLeaveDays,
+            0 as marriageLeaveDays,
+            0 as maternityLeaveDays,
+            0 as paternityLeaveDays,
+            0 as menstrualLeaveDays,
+            0 as breastfeedingLeaveDays,
+            0 as bereavementLeaveDays,
+            0 as backToUnit,
+            0 as onDutyLeave,
+            0 as outOfOffice,
+            0 as shiftCompensation,
+            0 as physicalExamination,
+            0 as quarantine,
+            0 as businessTrip,
+            0 as publicHoliday,
+            0 as childRearingLeave,
+            0 as transferBack,
+            0 as homeLeave
         FROM
             mortals_xhx_staff s
-        LEFT JOIN mortals_xhx_attendance_vacation_balance b ON s.id = b.staffId
         WHERE 1=1
         <if test="staffId != null and staffId!=''"> AND s.id = #{staffId}</if>
     </select>