Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

@@ -64,7 +64,7 @@ export default {
         url = "/perform/perpose/save";
       } else if (url == "/perform/rules/attend/save") {
         url = "/perform/rules/category/save";
-      } else if ((url == "/perform/staff/conf/save")) {
+      } else if (url == "/perform/staff/conf/save") {
         sessionStorage.getItem("type") == 1
           ? (url = "/perform/dept/conf/save")
           : sessionStorage.getItem("type") == 2

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

@@ -212,7 +212,7 @@ export default {
           height: 100%;
           color: #eee;
           cursor: pointer;
-          margin-right: 20px;
+          margin-right: 10px;
         }
         .active {
           color: #fff;

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

@@ -35,7 +35,7 @@
           clearable="true"
           @change="item.change"
           @clear="item.clear"
-          :placeholder="item.label?item.label:'请选择'"
+          :placeholder="item.label ? item.label : '请选择'"
           v-if="item.type === 'select'"
         >
           <el-option
@@ -111,7 +111,7 @@
           v-if="item.type === 'date' && !item.valueFormat"
           type="date"
           value-format="yyyy-MM-dd"
-          :placeholder="item.label?item.label:'选择日期'"
+          :placeholder="item.label ? item.label : '选择日期'"
         >
         </el-date-picker>
 
@@ -120,7 +120,7 @@
           v-if="item.type === 'date' && item.valueFormat"
           type="date"
           :value-format="item.valueFormat"
-          :placeholder="item.label?item.label:'选择日期'"
+          :placeholder="item.label ? item.label : '选择日期'"
         >
         </el-date-picker>
 
@@ -129,7 +129,7 @@
           v-if="item.type === 'month' && !item.valueFormat"
           type="month"
           value-format="yyyy-MM"
-          :placeholder="item.label?item.label:'选择月份'"
+          :placeholder="item.label ? item.label : '选择月份'"
         >
         </el-date-picker>
 
@@ -138,7 +138,7 @@
           v-if="item.type === 'month' && item.valueFormat"
           type="month"
           :value-format="item.valueFormat"
-          :placeholder="item.label?item.label:'选择月份'"
+          :placeholder="item.label ? item.label : '选择月份'"
         >
         </el-date-picker>
 
@@ -259,7 +259,6 @@ export default {
     },
     cleanForm() {
       this.clean();
-      this.onSubmit();
     },
     // 清空表单值
     clean() {
@@ -268,34 +267,35 @@ export default {
         if (item.name === "groupList") {
           newData[item.name] = [];
         } else {
-          newData[item.name] = item.multiple ? [] : undefined;
+          newData[item.name] = item.multiple ? [] : "";
         }
       });
       this.form = Object.assign({}, this.form, newData);
+      this.onSubmit();
     },
     onSubmit() {
       let { path, query } = this.$route;
-      if(this.form.attendanceDateStart && this.form.attendanceDateEnd){
-        let startValue = Date.parse(this.form.attendanceDateStart)
-        let endValue = Date.parse(this.form.attendanceDateEnd)
-        if(startValue>endValue){
-          this.$message.error('查询-结束的日期需大于开始日期')
-          this.form.attendanceDateEnd = ''
-          return false
+      if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
+        let startValue = Date.parse(this.form.attendanceDateStart);
+        let endValue = Date.parse(this.form.attendanceDateEnd);
+        if (startValue > endValue) {
+          this.$message.error("查询-结束的日期需大于开始日期");
+          this.form.attendanceDateEnd = "";
+          return false;
         }
       }
 
-      if(this.form.startTime && this.form.endTime){
-        let startValue = Date.parse(this.form.startTime)
-        let endValue = Date.parse(this.form.endTime)
-        if(startValue>endValue){
-          this.$message.error('查询-结束的日期需大于开始日期')
-          this.form.endTime = ''
-          return false
+      if (this.form.startTime && this.form.endTime) {
+        let startValue = Date.parse(this.form.startTime);
+        let endValue = Date.parse(this.form.endTime);
+        if (startValue > endValue) {
+          this.$message.error("查询-结束的日期需大于开始日期");
+          this.form.endTime = "";
+          return false;
         }
       }
 
-      let params = JSON.parse(JSON.stringify(this.form))  //不更改原始数据
+      let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       // console.log(this.form,'form参数')
       let data = this.decode(params);
       // Object.assign({}, query, data)
@@ -303,9 +303,9 @@ export default {
         path: path,
         query: {
           ...query,
-          ...data
+          ...data,
         },
-      })
+      });
     },
     // 解析url字符串，去除query字段
     encode(data, formTemp) {
@@ -352,17 +352,17 @@ export default {
             val.length > 0
           ) {
             //支持模糊查询,收尾增加百分号
-            val = val.trim()
-            if(val.charAt(0)!='%'){
-              val = "%" + val
+            val = val.trim();
+            if (val.charAt(0) != "%") {
+              val = "%" + val;
             }
-            if(val.charAt(val.length-1)!='%'){
-                val =val + "%";
+            if (val.charAt(val.length - 1) != "%") {
+              val = val + "%";
             }
           }
-        })
+        });
         newData[item] = this.decodeVal(val);
-      })
+      });
       return newData;
     },
     decodeVal(val) {
@@ -389,8 +389,8 @@ export default {
         // groupList: [],
       },
       remoteOptions: {},
-    }
-  }
+    };
+  },
 };
 </script>
 
@@ -424,4 +424,3 @@ export default {
   }
 }
 </style>
-

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/attend/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -157,7 +158,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "checkStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -177,7 +178,7 @@ export default {
           {
             name: "staffName",
             type: "text",
-            label: "请输入员工姓名搜索",
+            label: "员工姓名搜索",
             fuzzy: false,
           },
         ],
@@ -209,9 +210,13 @@ export default {
 
           { label: "异常结果", prop: "errorResult" },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           { label: "扣分方式", prop: "subMethod", formatter: this.formatter },
 
@@ -227,7 +232,7 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
@@ -235,12 +240,23 @@ export default {
             label: "操作",
             width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
                   noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
+                  noEdit
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/complain/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -158,7 +159,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "checkStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -170,7 +171,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "source",
+            name: "complainSource",
             type: "select",
             label: "全部来源",
             fuzzy: false,
@@ -214,7 +215,11 @@ export default {
 
           { label: "投诉来源", prop: "complainSource" },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "投诉设备", prop: "complainDevice" },
 
@@ -234,7 +239,7 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
@@ -242,11 +247,22 @@ export default {
             label: "操作",
             width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
+                  noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
                   noEdit
                   row={row}
                   onEdit={this.toEdit}

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/effect/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -216,7 +217,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "绩效规则", prop: "ruleName" },
 
@@ -234,20 +239,31 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
                   noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
+                  noEdit
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/gowork/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -158,7 +159,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "checkStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -204,7 +205,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "绩效规则", prop: "ruleName" },
 
@@ -222,20 +227,31 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
                   noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
+                  noEdit
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/other/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -157,7 +158,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "checkStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -212,7 +213,11 @@ export default {
           //   },
 
           //   { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "绩效规则", prop: "ruleName" },
 
@@ -230,20 +235,31 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
                   noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
+                  noEdit
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -112,7 +112,8 @@ export default {
       this.$download(
         "/check/review/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -157,7 +158,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "checkStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -169,7 +170,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "source",
+            name: "reviewSource",
             type: "select",
             label: "全部来源",
             fuzzy: false,
@@ -213,7 +214,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "绩效规则", prop: "ruleNme" },
 
@@ -231,7 +236,7 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 
@@ -239,12 +244,23 @@ export default {
             label: "操作",
             width: 200,
             formatter: (row) => {
-              return (
+              return row.checkStatus == 1 ? (
                 <table-buttons
                   noAdd
                   noDel
                   noEdit
                   reCheck
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noDel
+                  noEdit
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

 <template>
   <div class="page">
-    <LayoutTable :data="tableData" :config="tableConfig">
+    <LayoutTable :data="tableData" notDel :config="tableConfig">
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
@@ -120,7 +120,8 @@ export default {
       this.$download(
         "/perform/attend/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -136,10 +137,12 @@ export default {
     },
     /** 重写编辑方法 */
     toEdit(row) {
+      row.view = "核查";
       this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */
     toView(row) {
+      row.view = "查看";
       this.$refs.drawerform.view(row);
     },
   },
@@ -163,7 +166,7 @@ export default {
         isshowTabPane: true,
         search: [
           {
-            name: "status",
+            name: "processStatus",
             type: "select",
             label: "全部状态",
             fuzzy: false,
@@ -215,7 +218,11 @@ export default {
 
           { label: "异常结果", prop: "errorResult" },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "绩效规则", prop: "ruleNme" },
 
@@ -233,7 +240,7 @@ export default {
 
           {
             label: "处理状态",
-            prop: "checkStatus",
+            prop: "processStatus",
             formatter: this.formatter,
           },
 
@@ -241,9 +248,19 @@ export default {
             label: "操作",
             width: 200,
             formatter: (row) => {
-              return (
+              return row.processStatus == 1 ? (
+                <table-buttons
+                  noAdd
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : (
                 <table-buttons
                   noAdd
+                  noEdit
+                  noDel
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -219,7 +219,11 @@ export default {
 
           { label: "投诉来源", prop: "complainSource" },
 
-          { label: "图片凭证", prop: "snapPath" },
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
 
           { label: "投诉设备", prop: "complainDevice" },
 

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

@@ -222,8 +222,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "图片凭证", prop: "snapPath" },
-
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
           { label: "绩效规则", prop: "ruleName" },
 
           { label: "扣分方式", prop: "subMethod", formatter: this.formatter },

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

@@ -209,8 +209,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "图片凭证", prop: "snapPath" },
-
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
           { label: "绩效规则", prop: "ruleName" },
 
           { label: "扣分方式", prop: "subMethod", formatter: this.formatter },

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

@@ -218,8 +218,11 @@ export default {
           //   },
 
           //   { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
-          { label: "图片凭证", prop: "snapPath" },
-
+          {
+            label: "图片凭证",
+            prop: "filePaths",
+            formatter: this.formatterPic,
+          },
           { label: "绩效规则", prop: "ruleName" },
 
           { label: "扣分方式", prop: "subMethod", formatter: this.formatter },

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

 <template>
   <div class="page">
-    <LayoutTable :data="tableData" :config="tableConfig">
+    <LayoutTable :data="tableData" notDel :config="tableConfig">
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
@@ -120,7 +120,8 @@ export default {
       this.$download(
         "/perform/review/record/exportExcel",
         {
-          idList: this.selection,
+          page: 1,
+          size: -1,
         },
         { type: "excel" }
       )
@@ -136,10 +137,12 @@ export default {
     },
     /** 重写编辑方法 */
     toEdit(row) {
+      row.view = "核查";
       this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */
     toView(row) {
+      row.view = "查看";
       this.$refs.drawerform.view(row);
     },
   },
@@ -245,7 +248,7 @@ export default {
             label: "操作",
             width: 200,
             formatter: (row) => {
-              return (
+              return row.processStatus == 1 ? (
                 <table-buttons
                   noAdd
                   row={row}
@@ -253,6 +256,16 @@ export default {
                   onView={this.toView}
                   onDel={this.toDel}
                 />
+              ) : (
+                <table-buttons
+                  noAdd
+                  noEdit
+                  noDel
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
               );
             },
           },

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/impl/IdgeneratorServiceImpl.java

@@ -56,6 +56,14 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
          */
         INFO_VERSION_KEY(50L, "getInfoVersion", null),
 
+
+        ATTEND_KEY(50L, "attend", null),
+        REVIEW_KEY(50L, "review", null),
+        COMPLAIN_KEY(50L, "complain", null),
+        GOWORK_KEY(50L, "gowork", null),
+        EFFECT_KEY(50L, "effect", null),
+        OTHER_KEY(50L, "other", null),
+
         /** 空，测试用 */
         DUMMY(DEFAULT_STEP, "", null),
         ;
@@ -125,6 +133,42 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
         }
     }
 
+    private Long attend() {
+        synchronized (IdGeneratorKey.ATTEND_KEY) {
+            return getNextSequenceId(IdGeneratorKey.ATTEND_KEY, null);
+        }
+    }
+
+    private Long review() {
+        synchronized (IdGeneratorKey.REVIEW_KEY) {
+            return getNextSequenceId(IdGeneratorKey.REVIEW_KEY, null);
+        }
+    }
+
+    private Long complain() {
+        synchronized (IdGeneratorKey.COMPLAIN_KEY) {
+            return getNextSequenceId(IdGeneratorKey.COMPLAIN_KEY, null);
+        }
+    }
+
+    private Long gowork() {
+        synchronized (IdGeneratorKey.GOWORK_KEY) {
+            return getNextSequenceId(IdGeneratorKey.GOWORK_KEY, null);
+        }
+    }
+
+    private Long effect() {
+        synchronized (IdGeneratorKey.EFFECT_KEY) {
+            return getNextSequenceId(IdGeneratorKey.EFFECT_KEY, null);
+        }
+    }
+
+    private Long other() {
+        synchronized (IdGeneratorKey.OTHER_KEY) {
+            return getNextSequenceId(IdGeneratorKey.OTHER_KEY, null);
+        }
+    }
+
     // *******************************************************************************
 
     /**

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

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+public class PerformSaveReq extends BaseReq {
+
+    /**
+     * 工号
+     */
+    private String workNum;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 扣分时间
+     */
+    private Date happenTime;
+
+    /**
+     * 规则编码
+     */
+    private String ruleCode;
+
+
+    /**
+     * 类型
+     */
+    private String performType;
+
+}

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

+package com.mortals.xhx.busiz.web;
+
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.BaseReq;
+import com.mortals.xhx.busiz.req.PerformReq;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Map;
+
+import static com.mortals.framework.ap.SysConstains.*;
+
+public abstract class AbstractBaseController<T extends BaseReq> extends BaseJsonBodyController {
+
+
+
+    protected PageInfo buildPageInfo(T query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        return pageInfo;
+    }
+
+
+    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
+        model.put(TOTAL, pageInfo.getTotalResult());
+        model.put(PER_PAGE, pageInfo.getPrePageResult());
+        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
+        model.put(LAST_PAGE, pageInfo.getTotalPage());
+        model.put(PAGEINFO_KEY, pageInfo);
+    }
+
+}

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

+package com.mortals.xhx.busiz.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
+import com.mortals.xhx.base.framework.annotation.ApiUserAuth;
+import com.mortals.xhx.busiz.req.PerformReq;
+import com.mortals.xhx.busiz.req.PerformSaveReq;
+import com.mortals.xhx.busiz.rsp.ApiResp;
+import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.module.perform.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/web/perform")
+public class ApiWebPerformController extends AbstractBaseController<PerformReq> {
+
+    @Autowired
+    private PerformAttendRecordService attendRecordService;
+    @Autowired
+    private PerformReviewRecordService reviewRecordService;
+    @Autowired
+    private PerformComplainRecordService complainRecordService;
+    @Autowired
+    private PerformGoworkRecordService performGoworkRecordService;
+    @Autowired
+    private PerformEffectRecordService effectRecordService;
+    @Autowired
+    private PerformOtherRecordService otherRecordService;
+    @Autowired
+    private PerformRulesService rulesService;
+
+
+
+
+    /**
+     * 绩效外部新增
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("save")
+    @ApiUserAuth
+    public String receive(HttpServletRequest request, @RequestBody PerformSaveReq req) {
+        ApiResp<String> rsp = new ApiResp<>();
+        rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
+        rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
+        StringBuilder message = new StringBuilder();
+        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
+        recordSysLog(request, message.toString());
+        try {
+            switch (PerformTypeEnum.getByValue(req.getPerformType())) {
+                case 考勤绩效:
+                    attend(req);
+                    break;
+                case 评价差评绩效:
+                    review(req);
+                    break;
+                case 评价投诉绩效:
+                    complain(req);
+                    break;
+                case 办件绩效:
+                    gowork(req);
+                    break;
+                case 效能绩效:
+                    effect(req);
+                    break;
+                case 其它绩效:
+                    other(req);
+                    break;
+            }
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        } catch (Exception e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        }
+        log.info("响应【设备接收】【响应体】-->  " + JSONObject.toJSONString(rsp));
+        return JSON.toJSONString(rsp);
+    }
+    private void attend(PerformSaveReq req) throws AppException {
+        //考勤保存
+    }
+
+    private void review(PerformSaveReq req) throws AppException {
+        //评价保存
+    }
+
+    private void complain(PerformSaveReq req) throws AppException {
+        //投诉保存
+    }
+
+    private void gowork(PerformSaveReq req) throws AppException {
+        //办件保存
+    }
+
+    private void effect(PerformSaveReq req) throws AppException {
+        //效能保存
+    }
+
+    private void other(PerformSaveReq req) throws AppException {
+        //其它保存
+    }
+
+
+    public static void main(String[] args) {
+
+    }
+
+}

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

@@ -53,20 +53,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/appeal")
-public class AppealApiController extends BaseJsonBodyController {
-
-//    @Autowired
-//    private CheckAttendRecordService checkAttendRecordService;
-//    @Autowired
-//    private CheckReviewRecordService checkReviewRecordService;
-//    @Autowired
-//    private CheckComplainRecordService checkComplainRecordService;
-//    @Autowired
-//    private CheckEffectRecordService checkEffectRecordService;
-//    @Autowired
-//    private CheckGoworkRecordService checkGoworkRecordService;
-//    @Autowired
-//    private CheckOtherRecordService checkOtherRecordService;
+public class AppealApiController extends AbstractBaseController<PerformReq> {
 
     @Autowired
     private PerformAttendAppealService attendAppealService;

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

@@ -11,6 +11,7 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.busiz.req.AppealReq;
 import com.mortals.xhx.busiz.req.FeedbackReq;
+import com.mortals.xhx.busiz.req.PerformReq;
 import com.mortals.xhx.busiz.rsp.AppealStatInfo;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.check.service.*;
@@ -45,7 +46,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/feedback")
-public class FeedbackApiController extends BaseJsonBodyController {
+public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
 
     @Autowired
     private FeedbackService feedbackService;

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

@@ -50,7 +50,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/perform")
-public class PerformApiController extends BaseJsonBodyController {
+public class PerformApiController extends AbstractBaseController<PerformReq> {
 
 
     @Autowired
@@ -278,27 +278,6 @@ public class PerformApiController extends BaseJsonBodyController {
     }
 
 
-    protected PageInfo buildPageInfo(PerformReq query) {
-        PageInfo pageInfo = new PageInfo();
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
-            pageInfo.setCurrPage(query.getPage());
-        }
-
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
-            pageInfo.setPrePageResult(query.getSize());
-        }
-
-        return pageInfo;
-    }
-
-
-    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
-        model.put(TOTAL, pageInfo.getTotalResult());
-        model.put(PER_PAGE, pageInfo.getPrePageResult());
-        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
-        model.put(LAST_PAGE, pageInfo.getTotalPage());
-        model.put(PAGEINFO_KEY, pageInfo);
-    }
 
     public static void main(String[] args) {
 

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

 package com.mortals.xhx.busiz.web;
 
 
+import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
+import com.mortals.xhx.base.system.idgenerator.service.impl.IdgeneratorServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
+    @Autowired
+    private IdgeneratorService idgeneratorService;
+
     @GetMapping("webservice")
     public String webservice() {
         log.info("测试");
@@ -24,6 +30,16 @@ public class TestController {
         return "ok";
     }
 
+    @GetMapping("idGens")
+    public String idGens() {
+        log.info("测试id生成");
+
+        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT).toString();
+
+
+        return stringId;
+    }
+
 
 
     public static void main(String[] args) {

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/ProcessStatusEnum.java

@@ -4,14 +4,13 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 状态 (0.未开始,1.进行中,2.已结束)枚举类
+* 处理状态(1.未核查,2.已核查)枚举类
 *
 * @author zxfei
 */
 public enum ProcessStatusEnum {
-    未开始(0, "未开始"),
-    进行中(1, "进行中"),
-    已结束(2, "已结束");
+    未核查(1, "未核查"),
+    已核查(2, "已核查");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/SubMethodEnum.java

@@ -4,14 +4,13 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)枚举类
+* 扣分方式(1.系统自动,2.人工添加)枚举类
 *
 * @author zxfei
 */
 public enum SubMethodEnum {
     系统自动(1, "系统自动"),
-    人工添加(2, "人工添加"),
-    大厅巡查(3, "大厅巡查");
+    人工添加(2, "人工添加");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAttendRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 考勤绩效记录核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckAttendRecordDao extends ICRUDDao<CheckAttendRecordEntity,Long>{