Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -19,6 +19,14 @@ export default {
   watch: {
     $route(route) {
       this.query = Object.assign({}, this.query, route.query);
+      if (this.query.yearmonth == undefined) {
+        delete this.query.month;
+        delete this.query.year;
+      }
+      if (this.query.createTimeMonth == undefined) {
+        delete this.query.createTimeStart;
+        delete this.query.createTimeEnd;
+      }
       this.getData();
     },
   },

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -332,11 +332,30 @@ export default {
           newData[item.name] = item.multiple ? [] : "";
         }
       });
+
+      delete this.$route.query.yearmonth;
+      delete this.$route.query.createTimeMonth;
+
       this.form = Object.assign({}, this.form, newData);
       this.onSubmit();
     },
     onSubmit() {
       let { path, query } = this.$route;
+      if (this.form.yearmonth) {
+        let arr = this.form.yearmonth.split("-");
+        this.form.year = arr[0];
+        this.form.month = arr[1];
+      } else {
+        this.form.year = undefined;
+        this.form.month = undefined;
+      }
+      if (this.form.createTimeMonth) {
+        this.form.createTimeStart = this.form.createTimeMonth + "-01";
+        this.form.createTimeEnd = this.form.createTimeMonth + "-31";
+      } else {
+        this.form.createTimeStart = undefined;
+        this.form.createTimeEnd = undefined;
+      }
       if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
         let startValue = Date.parse(this.form.attendanceDateStart);
         let endValue = Date.parse(this.form.attendanceDateEnd);
@@ -375,9 +394,21 @@ export default {
         delete this.form.summaryTimeEnd;
       }
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
-      console.log(this.form, "form参数");
       let data = this.decode(params);
+
       // Object.assign({}, query, data)
+      console.log({
+        ...query,
+        ...data,
+      });
+      if (!query.yearmonth) {
+        query.year = undefined;
+        query.month = undefined;
+      }
+      if (!query.createTimeMonth) {
+        query.createTimeEnd = undefined;
+        query.createTimeStart = undefined;
+      }
       this.$router.push({
         path: path,
         query: {

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -182,9 +182,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -189,9 +189,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -184,9 +184,9 @@ export default {
           },
 
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择开始日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -183,9 +183,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -182,9 +182,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -188,9 +188,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -190,9 +190,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -196,9 +196,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -192,9 +192,9 @@ export default {
           },
 
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -190,9 +190,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -190,9 +190,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue

@@ -196,9 +196,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTime",
-            type: "datetime",
-            label: "请选择日期",
+            name: "createTimeMonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -78,7 +78,9 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>
-                  <el-button type="text" @click="syncPerson">同步数据</el-button>
+                  <el-button type="text" @click="syncPerson"
+                    >同步数据</el-button
+                  >
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-button type="text" @click="handleImport"
@@ -100,7 +102,13 @@
 
             <span class="freshTime" slot="table-head-left2">
               <i class="el-icon-refresh"></i>
-              <span>上次同步时间：{{ tableData.staff.refreshDate }}</span>
+              <span
+                >上次同步时间：{{
+                  tableData.staff
+                    ? tableData.staff.refreshDate
+                    : "--"
+                }}</span
+              >
             </span>
           </LayoutTable>
         </el-row>
@@ -223,7 +231,7 @@ export default {
     syncPerson() {
       this.$post("/staff/syncPersons", {}).then((res) => {
         if (res.code == 1) {
-            this.$message.success(res.msg)
+          this.$message.success(res.msg);
         }
       });
     },
@@ -474,12 +482,18 @@ export default {
 }
 
 .mytree ::v-deep {
-  .el-tree--highlight-current ::v-deep .el-tree-node.is-checked > .el-tree-node__content {
+  .el-tree--highlight-current
+    ::v-deep
+    .el-tree-node.is-checked
+    > .el-tree-node__content {
     background-color: rgb(255, 255, 255);
     color: rgb(64, 158, 255);
   }
 
-  .el-tree--highlight-current ::v-deep .el-tree-node.is-current > .el-tree-node__content {
+  .el-tree--highlight-current
+    ::v-deep
+    .el-tree-node.is-current
+    > .el-tree-node__content {
     background-color: rgb(255, 255, 255);
     color: rgb(64, 158, 255);
   }

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -27,6 +27,7 @@ export default {
   },
   mixins: [table],
   created() {},
+ 
   methods: {
     /** 导出Excel */
     doExport() {
@@ -65,9 +66,9 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "createTimeStart",
-            type: "date",
-            label: "月份",
+            name: "yearmonth",
+            type: "month",
+            label: "请选择月份",
             fuzzy: false,
           },
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -157,15 +157,15 @@ public class DingMessageController {
                                 String leave_name = "事假";
                                 if(result.getFormComponentValues().size() > 0 ){
                                     JSONArray jsonArray = JSONArray.parseArray(result.getFormComponentValues().get(0).getValue());
-                                    if(jsonArray.size() > 0){
+                                    if(jsonArray!= null && jsonArray.size() > 0){
                                         Date startTime1 = dateFormat(jsonArray.get(0).toString(),"yyyy-MM-dd HH:mm",true);
                                         leaveRecordEntity.setStartTime(startTime1);
                                     }
-                                    if(jsonArray.size() > 1){
+                                    if(jsonArray!= null && jsonArray.size() > 1){
                                         Date endTime1 = dateFormat(jsonArray.get(1).toString(),"yyyy-MM-dd HH:mm",false);
                                         leaveRecordEntity.setEndTime(endTime1);
                                     }
-                                    if(jsonArray.size() > 2){
+                                    if(jsonArray!= null && jsonArray.size() > 2){
                                         if(jsonArray.size() > 3){
                                             switch (jsonArray.get(3).toString()){
                                                 case "halfDay":
@@ -182,7 +182,7 @@ public class DingMessageController {
                                         }
 
                                     }
-                                    if(jsonArray.size() > 4){
+                                    if(jsonArray!= null && jsonArray.size() > 4){
                                         leave_name = jsonArray.get(4).toString();
                                         switch (leave_name){
                                             case "调休":

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java

@@ -43,10 +43,10 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
     private DeptService deptService;
     @Autowired
     private WorkmanService workmanService;
-//    @Autowired
-//    private UserService userService;
     @Autowired
-    private IUserFeign iUserFeign;
+    private UserService userService;
+//    @Autowired
+//    private IUserFeign iUserFeign;
 
     public AttendanceLeaveRecordController(){
         super.setModuleDesc( "请假记录信息");
@@ -59,20 +59,20 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
         this.addDict(model, "leaveType", paramService.getParamBySecondOrganize("AttendanceLeaveRecord","leaveType"));
         this.addDict(model, "auditResult", AppealResultEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
-//        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
-
-        //从门户获取登录用户信息
-        UserPdu userPdu = new UserPdu();
-        userPdu.setSize(-1);
-        List <UserPdu> userPduList = iUserFeign.list(userPdu).getData().getData();
-        Map<String, String> ans = new HashMap<>();
-        for(UserPdu str: userPduList) {
-            if(str != null) {  //增加非空判断
-                ans.put(str.getId().toString(), str.getRealName());
-            }
-        }
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
 
-        this.addDict(model, "createUserId", ans);
+//        //从门户获取登录用户信息
+//        UserPdu userPdu = new UserPdu();
+//        userPdu.setSize(-1);
+//        List <UserPdu> userPduList = iUserFeign.list(userPdu).getData().getData();
+//        Map<String, String> ans = new HashMap<>();
+//        for(UserPdu str: userPduList) {
+//            if(str != null) {  //增加非空判断
+//                ans.put(str.getId().toString(), str.getRealName());
+//            }
+//        }
+//
+//        this.addDict(model, "createUserId", ans);
 
 
         super.init(model, context);