修改时间

attendance-performance-manager-ui/admin/src/assets/utils/index.js

@@ -51,7 +51,7 @@ export const encodeURI = (data) => {
  * @returns {string} val 解析后的结果
  */
 export function formatterDate(time) {
-  if (!time) return '';
+  if (!time) return '--';
   let date = new Date(Number(time));
   let Y = date.getFullYear() + '-';
   let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';

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

@@ -35,7 +35,7 @@
               }}</el-col
             >
             <el-col :span="8"
-              >异常时间：{{ form.errorTime ? form.errorTime : "--" }}</el-col
+              >异常时间：{{ formatterDate(form.appealTime)}}</el-col
             >
             <el-col :span="8"
               >上下班时间：{{
@@ -46,7 +46,7 @@
           <el-row>
             <el-col :span="10"
               >实际打卡时间：{{
-                form.actualAttendTime ? form.actualAttendTime : "--"
+                formatterDate(form.appealTime)
               }}</el-col
             >
             <el-col :span="9"
@@ -63,7 +63,7 @@
           <el-row>
             <el-col :span="8"
               >加分/扣分时间：{{
-                form.deductTime ? form.deductTime : "--"
+                formatterDate(form.appealTime)
               }}</el-col
             >
             <el-col :span="8"
@@ -102,7 +102,7 @@
               }}</el-col
             >
             <el-col :span="8"
-              >核查时间：{{ form.checkTime ? form.checkTime : "--" }}</el-col
+              >核查时间：{{ formatterDate(form.appealTime) }}</el-col
             >
           </el-row>
         </div>
@@ -115,7 +115,7 @@
               >申诉说明：{{ form.appealDesc ? form.appealDesc : "--" }}</el-col
             >
             <el-col :span="24"
-              >申诉时间：{{ form.appealTime ? form.appealTime : "--" }}</el-col
+              >申诉时间：{{ formatterDate(form.appealTime)}}</el-col
             >
             <el-col :span="24"
               >申诉附件：
@@ -150,7 +150,7 @@
               >处理人员：</el-col
             >
             <el-col :span="8"
-              >处理时间：{{dict}} {{ form.appealTime ? form.appealTime : "--" }}</el-col
+              >处理时间：{{dict}} {{ formatterDate(form.appealTime) }}</el-col
             >
           </el-row>
           <el-row>
@@ -459,6 +459,7 @@
 import form from "@/assets/mixins/formdialog";
 import { timestampToTime } from "@/assets/utils/dateFormat.js";
 import { downloadFile } from "@/assets/utils/index";
+import { formatterDate } from "@/assets/utils/index";
 
 export default {
   name: "PerformAttendAppealDetail",
@@ -501,6 +502,7 @@ export default {
   },
 
   methods: {
+    formatterDate,
     // 下载附件
     hanldeDownloadFile(val) {
       console.log(val);

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

@@ -14,8 +14,10 @@ import com.mortals.xhx.common.code.EnabledEnum;
 import com.mortals.xhx.common.code.IrregularTypeEnum;
 import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.perform.model.PerformRulesQuery;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
+import com.mortals.xhx.module.perform.service.PerformRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -61,6 +63,8 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private PerformRulesService rulesService;
 
 
     public PerformAttendAppealController() {
@@ -71,6 +75,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
     protected void init(Map<String, Object> model, Context context) {
 
         this.addDict(model, "updateUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
+        this.addDict(model, "ruleId", rulesService.find(new PerformRulesQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
 
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subMethod"));
         this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subAddType"));