Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue

@@ -154,11 +154,10 @@ export default {
         ],
         approverId: [
           { required: true, message: "请选择审批人", trigger: "change" },
-        ]
-/*        ,
+        ],
         attachmentPath: [
           { required: true, message: "请上传附件文件", trigger: "change" },
-        ],*/
+        ],
       },
       attachmentPath: "",
     };

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -170,7 +170,10 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="申诉结果：">
-                <el-radio-group v-model="form.appealResult">
+                <el-radio-group
+                  v-model="form.appealResult"
+                  @input="radioChange"
+                >
                   <el-radio :label="1">通过</el-radio>
                   <el-radio :label="2">不通过</el-radio>
                 </el-radio-group>
@@ -514,6 +517,10 @@ export default {
   },
 
   methods: {
+    radioChange(val) {
+      this.form.appealResult = val;
+      this.$forceUpdate(this.form);
+    },
     util_formatter(key, val) {
       try {
         return this.dict[key][val];
@@ -677,7 +684,7 @@ export default {
         processStatus: 1,
         appealDesc: "",
         appealTime: null,
-        appealResult: 2,
+        appealResult: "",
         remark: "",
       };
       this.resetForm("form");

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
-      <el-button slot="table-head-left2" style="margin-left: 10px" icon="el-icon-tickets" size="mini" @click="doExport"
-        :disabled="isExport">导出</el-button>
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        icon="el-icon-tickets"
+        size="mini"
+        @click="doExport"
+        :disabled="isExport"
+        >导出</el-button
+      >
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -19,7 +26,7 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() { },
+  created() {},
   methods: {
     /** 导出Excel */
     doExport() {
@@ -62,7 +69,6 @@ export default {
             type: "date",
             label: "月份",
             fuzzy: false,
-
           },
 
           {
@@ -86,12 +92,15 @@ export default {
           { label: "姓名", prop: "staffName" },
 
           { label: "工号", prop: "workNum" },
+          
+          { label: "手机号", prop: "phoneNumber" },
 
           { label: "所属部门", prop: "deptName" },
           {
-            label: "所属心中", formatter: (row) => {
-              return '宜宾市民中心'
-            }
+            label: "所属中心",
+            formatter: (row) => {
+              return "宜宾市民中心";
+            },
           },
 
           { label: "考勤绩效", prop: "attendScore", formatter: this.formatter },

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

@@ -7,6 +7,7 @@ import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo;
 import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo;
 import com.mortals.xhx.module.feedback.model.vo.QuestionAnswerVo;
+import com.mortals.xhx.module.feedback.service.FeedbackAnswerService;
 import com.mortals.xhx.module.feedback.service.FeedbackStaffService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,8 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     private FeedbackQuestionService feedbackQuestionService;
     @Autowired
     private FeedbackStaffService feedbackStaffService;
+    @Autowired
+    private FeedbackAnswerService feedbackAnswerService;
 
 
     @Override
@@ -67,7 +70,11 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             if(DateUtil.compare(new Date(),feedbackTimeEnd)>0){
                 item.setProcessStatus(2);
             }
-
+            List<FeedbackAnswerEntity> answerEntities = feedbackAnswerService.find(new FeedbackAnswerQuery().feedbackId(item.getId()));
+            if(CollectionUtils.isNotEmpty(answerEntities)){
+                Map<Long,List<FeedbackAnswerEntity>> groupMap = answerEntities.stream().collect(Collectors.groupingBy(FeedbackAnswerEntity::getStaffId));
+                item.setFeedbackNum(groupMap.size());
+            }
         });
     }
 

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

 package com.mortals.xhx.module.feedback.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -88,6 +89,24 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
             }
         }
 
+        if(entity!=null) {
+            Date feedbackTimeStart = entity.getFeedbackTimeStart();
+            Date feedbackTimeEnd = entity.getFeedbackTimeEnd();
+
+            if (DateUtil.compare(new Date(), feedbackTimeStart) < 0) {
+                entity.setProcessStatus(0);
+            }
+
+            boolean in = DateUtil.isIn(new Date(), entity.getFeedbackTimeStart(), entity.getFeedbackTimeEnd());
+            if (in) {
+                entity.setProcessStatus(1);
+            }
+
+            if (DateUtil.compare(new Date(), feedbackTimeEnd) > 0) {
+                entity.setProcessStatus(2);
+            }
+        }
+
         return super.infoAfter(id, model, entity, context);
     }