Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/resources/templates/AttendanceNote/js/index.js

@@ -17,6 +17,11 @@
             var dataObj = {}
             trFragment.appendChild(generateTableTrHtml(listsLength))
             $(".tbody").append(trFragment)
+            let timeObj = {
+                index: listsLength,
+                startTime: "",
+                endTime: '',
+            }
             timeSelector({
                 ele: ".startTimeRange" + listsLength,
                 name: "AttendanceNoteTimeDO[" + listsLength + "]$startTimeRange",
@@ -27,6 +32,7 @@
                         z.ui.alertWarning("请先选择起始日期!")
                         return;
                     }
+                    timeObj.startTime = Date.parse(startDate + " " + val);
                 }
             })
             timeSelector({

zjugis-business/src/main/resources/templates/Travel/js/index.js

@@ -17,6 +17,11 @@
             if (arrays.length > 0) {
                 listsLength = arrays.length + lists.length
             }
+            let timeObj = {
+                index: listsLength,
+                startTime: "",
+                endTime: '',
+            }
             timeSelector({
                 ele: ".startTimeRange" + listsLength,
                 name: "TravelTimeDO[" + listsLength + "]$startTimeRange",
@@ -27,6 +32,7 @@
                         z.ui.alertWarning("请先选择起始日期!")
                         return;
                     }
+                    timeObj.startTime = Date.parse(startDate + " " + val);
                 }
             })
             timeSelector({
@@ -87,7 +93,6 @@
             buildQjsjSeq();
             lists.push(dataObj)
         })
-        initPartners();
         $("#selectProject").click(function () {
             selectProject(null, setProject);
         })

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/PerformanceDetailDO.java

@@ -17,7 +17,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PerformanceDetailDO  {
+public class PerformanceDetailDO {
     /**
      * 主键ID
      */
@@ -39,6 +39,11 @@ public class PerformanceDetailDO  {
      */
     private String season;
 
+    /**
+     * 理由
+     */
+    private String reason;
+
     /**
      * 奖惩情况
      */