Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/package-lock.json

@@ -2384,8 +2384,6 @@
       "version": "3.16.0",
       "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -19674,6 +19672,7 @@
       "resolved": "https://registry.nlark.com/@vue/babel-preset-app/download/@vue/babel-preset-app-4.5.13.tgz",
       "integrity": "sha1-y0dTIeTHP38RDawppIwqnLgK/rY=",
       "requires": {
+        "@babel/core": "^7.11.0",
         "@babel/helper-compilation-targets": "^7.9.6",
         "@babel/helper-module-imports": "^7.8.3",
         "@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -19686,14 +19685,13 @@
         "@vue/babel-plugin-jsx": "^1.0.3",
         "@vue/babel-preset-jsx": "^1.2.4",
         "babel-plugin-dynamic-import-node": "^2.3.3",
+        "core-js": "^3.6.5",
         "core-js-compat": "^3.6.5",
         "semver": "^6.1.0"
       },
       "dependencies": {
         "core-js": {
-          "version": "3.16.0",
-          "optional": true,
-          "peer": true
+          "version": "3.16.0"
         }
       }
     },

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

@@ -55,7 +55,7 @@
                 :title="'申诉次数规则排名TOP20'"
                 :id="'rule_20'"
                 :legendName="'申诉次数'"
-                :styleObj="{ width: '1800px', height: '320px' }"
+                :styleObj="{ width: '1800px', height: '300px' }"
                 :chartsData="depChartsData"
               />
             </div>

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>
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -17,8 +19,25 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() {},
+  created() { },
   methods: {
+    /** 导出Excel */
+    doExport() {
+      this.isExport = true;
+      this.$download(
+        "/staff/perform/summary/exportExcel",
+        {
+          page: 1,
+          size: -1,
+        },
+        { type: "excel" }
+      )
+        .then(() => (this.isExport = false))
+        .catch((error) => {
+          this.isExport = false;
+          this.$message.error(error.message);
+        });
+    },
     /** 重写新增方法 */
     toAdd(row) {
       this.$refs.dialogform.add(row);
@@ -34,6 +53,7 @@ export default {
   },
   data() {
     return {
+      isExport: false,
       config: {
         isshowTabPane: true,
         search: [
@@ -68,6 +88,11 @@ export default {
           { label: "工号", prop: "workNum" },
 
           { label: "所属部门", prop: "deptName" },
+          {
+            label: "所属心中", formatter: (row) => {
+              return '宜宾市民中心'
+            }
+          },
 
           { label: "考勤绩效", prop: "attendScore", formatter: this.formatter },
 

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

@@ -137,36 +137,37 @@ public class CheckAllRecordController extends BaseJsonBodyController {
                 model.put("checkPercent",numberFormat.format(checkPercent));
                 BigDecimal appealPercent = current.getAppealScore().divide(current.getInitScore(),6,BigDecimal.ROUND_HALF_UP);
                 model.put("appealPercent",numberFormat.format(appealPercent));
-            }
-            CheckAllScoreSummaryVo last = checkAllRecordService.getScoreSummary(lastQuery);
-            if(last!=null){
-                BigDecimal huanbi = current.getTotal().subtract(last.getTotal());
-                huanbi = huanbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
-                model.put("huanbi",numberFormat.format(huanbi));
-            }
-            if (query.getSummaryType() == SummaryTopTypeEnum.年.getValue()) {
+
+                CheckAllScoreSummaryVo last = checkAllRecordService.getScoreSummary(lastQuery);
                 if(last!=null){
-                    model.put("tongbi",model.get("huanbi"));
+                    BigDecimal huanbi = current.getTotal().subtract(last.getTotal());
+                    huanbi = huanbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
+                    model.put("huanbi",numberFormat.format(huanbi));
                 }
-            }else {
-                String yyyy = query.getCheckTimeStart().substring(0,4);
-                int lastyear = DataUtil.converStr2Int(yyyy,0);
-                lastyear--;
-                if(query.getCheckTimeStart().substring(4).equals("-02-29")){
-                    lastQuery.setCheckTimeStart(lastyear+"-02-28");
+                if (query.getSummaryType() == SummaryTopTypeEnum.年.getValue()) {
+                    if(last!=null){
+                        model.put("tongbi",model.get("huanbi"));
+                    }
                 }else {
-                    lastQuery.setCheckTimeStart(lastyear+query.getCheckTimeStart().substring(4));
-                }
-                if(query.getCheckTimeEnd().substring(4).equals("-02-29")){
-                    lastQuery.setCheckTimeEnd(lastyear+"-02-28");
-                }else {
-                    lastQuery.setCheckTimeEnd(lastyear+query.getCheckTimeEnd().substring(4));
-                }
-                CheckAllScoreSummaryVo tb = checkAllRecordService.getScoreSummary(lastQuery);
-                if(tb!=null){
-                    BigDecimal tongbi = current.getTotal().subtract(tb.getTotal());
-                    tongbi = tongbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
-                    model.put("tongbi",numberFormat.format(tongbi));
+                    String yyyy = query.getCheckTimeStart().substring(0,4);
+                    int lastyear = DataUtil.converStr2Int(yyyy,0);
+                    lastyear--;
+                    if(query.getCheckTimeStart().substring(4).equals("-02-29")){
+                        lastQuery.setCheckTimeStart(lastyear+"-02-28");
+                    }else {
+                        lastQuery.setCheckTimeStart(lastyear+query.getCheckTimeStart().substring(4));
+                    }
+                    if(query.getCheckTimeEnd().substring(4).equals("-02-29")){
+                        lastQuery.setCheckTimeEnd(lastyear+"-02-28");
+                    }else {
+                        lastQuery.setCheckTimeEnd(lastyear+query.getCheckTimeEnd().substring(4));
+                    }
+                    CheckAllScoreSummaryVo tb = checkAllRecordService.getScoreSummary(lastQuery);
+                    if(tb!=null){
+                        BigDecimal tongbi = current.getTotal().subtract(tb.getTotal());
+                        tongbi = tongbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
+                        model.put("tongbi",numberFormat.format(tongbi));
+                    }
                 }
             }