Merge remote-tracking branch 'origin/master'

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

@@ -91,9 +91,16 @@ export default {
                     // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
                     {
                         label: "状态", prop: "processStatus", formatter: (row) => {
+
+                          let str="未开始"
+                          if(row.processStatus==1){
+                            str="进行中"
+                          }else if (row.processStatus==2){
+                            str="已结束"
+                          }
                             return (
-                                <el-tag type={row.processStatus ? row.processStatus = 1 ? 'success' : 'info' : 'danger'} size="small">
-                                    {row.processStatus ? row.processStatus = 1 ? '进行中' : '已结束' : '未开始'}
+                                <el-tag type={row.processStatus ? row.processStatus == 2 ? 'success' : 'info' : 'danger'} size="small">
+                                  {str}
                                 </el-tag>
                             )
                         }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/MockDataController.java

+package com.mortals.xhx.busiz;
+
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.utils.ServletUtils;
+import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.hik.face.model.req.img.ImgReq;
+import com.mortals.xhx.module.hik.face.service.IHikFaceService;
+import com.mortals.xhx.module.perform.model.PerformPerposeStaffEntity;
+import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
+import com.mortals.xhx.module.perform.service.PerformPerposeStaffService;
+import com.mortals.xhx.module.perform.service.PerformPerposeStaffStatService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.service.StaffService;
+import com.mortals.xhx.module.workman.model.WorkmanEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * 设备
+ *
+ * @author: zxfei
+ * @date: 2021/8/24 20:28
+ */
+@RestController
+@Slf4j
+@RequestMapping("/mock")
+public class MockDataController {
+
+    @Autowired
+    private IdgeneratorService idgeneratorService;
+
+    @Autowired
+    private ICacheService cacheService;
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private IHikFaceService faceService;
+    @Autowired
+    private UploadService uploadService;
+
+    @Autowired
+    private PerformPerposeStaffStatService perposeStaffStatService;
+
+
+    /**
+     * 生成模拟数据
+     * mortals_xhx_perform_perpose_staff_stat
+     *
+     * @return
+     */
+    @GetMapping("randomStatPerposeStaffData")
+    @UnAuth
+    public Rest<Void> randomStatPerposeStaffData() {
+        List<StaffEntity> cacheList = staffService.getCacheList();
+        //最近两月模拟数据
+        DateTime beforeStartDate = DateUtil.offsetDay(new Date(), 60);
+        for (int i = 1; i <= 60; i++) {
+            DateTime curDate = DateUtil.offsetDay(beforeStartDate, i);
+
+            List<PerformPerposeStaffStatEntity> collect = cacheList.stream().map(item -> {
+                PerformPerposeStaffStatEntity statEntity = new PerformPerposeStaffStatEntity();
+                statEntity.initAttrValue();
+                statEntity.setStaffId(item.getId());
+                statEntity.setStaffName(item.getName());
+                statEntity.setNumber(item.getWorkNum());
+
+                statEntity.setAbsentRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setAbsenceRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setLateRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setEarlyRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setLeaveRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setTurnoverRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setSleepRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setPlayPhoneRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setExpireWorkRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setNegaReviewRate(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+                statEntity.setYear(DateUtil.year(curDate));
+                statEntity.setMonth(DateUtil.month(curDate)+1);
+                statEntity.setDay(DateUtil.dayOfMonth(curDate));
+
+
+                return statEntity;
+
+            }).collect(Collectors.toList());
+            perposeStaffStatService.save(collect);
+
+        }
+
+
+        return Rest.ok();
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2,BigDecimal.ROUND_CEILING));
+    }
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java

@@ -17,6 +17,7 @@ import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.hik.face.model.req.img.ImgReq;
 import com.mortals.xhx.module.hik.face.service.IHikFaceService;
+import com.mortals.xhx.module.perform.service.PerformPerposeStaffService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffService;
@@ -62,6 +63,9 @@ public class TestController {
     @Autowired
     private UploadService uploadService;
 
+    @Autowired
+    private PerformPerposeStaffService performPerposeStaffService;
+
 
     //    @GetMapping("webservice")@GetMapping("idGens")
 //    public String idGens() {
@@ -207,11 +211,12 @@ public class TestController {
 
     /**
      * 生成模拟数据
+     *  mortals_xhx_perform_perpose_staff_stat
      * @return
      */
-    @GetMapping("randomStatData")
+    @GetMapping("randomStatPerposeStaffData")
     @UnAuth
-    public Rest<Void> randomMockStatData() {
+    public Rest<Void> randomStatPerposeStaffData() {
 
 
         return Rest.ok();