1.日考勤页面中增加显示工作时长。

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -1301,6 +1301,7 @@ public class WorkScheduleAttendanceController {
                 if (!exist) {
                     wsaDayDTO.setPersonInfo(pi);
                     wsaDayDTO.setAttendanceDate(sdf.parse(queryDate));
+                    wsaDayDTO.setWorkTimes("");
 //                    //上班
 //                    wsaDayDTO.setOnWorkResult(wsa.getResult());
 //                    wsaDayDTO.setOnWorkStatus(wsa.getWorkStatus());
@@ -2016,19 +2017,19 @@ public class WorkScheduleAttendanceController {
     }
 
     //分钟转小时
-    private String formatTime(int minuteStr) {
+    private String formatTime(int minute) {
 
         String resultStr = "";
 
-        if (minuteStr != 0) {
-            if (minuteStr != 0) {
-                if (minuteStr / 60 == 0) {
-                    resultStr = minuteStr % 60 + "分";
+        if (minute != 0) {
+            if (minute != 0) {
+                if (minute / 60 == 0) {
+                    resultStr = minute % 60 + "分";
                 } else {
-                    if (minuteStr % 60 == 0) {
-                        resultStr = minuteStr / 60 + "小时";
+                    if (minute % 60 == 0) {
+                        resultStr = minute / 60 + "小时";
                     } else {
-                        resultStr = (minuteStr / 60 + "小时" + minuteStr % 60 + "分");
+                        resultStr = (minute / 60 + "小时" + minute % 60 + "分");
                     }
                 }
             } else {