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

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

@@ -224,100 +224,24 @@ export default {
         type: [],
         resource: "",
       },
-      config: {
-        data: [
-          {
-            name: "部门1",
-            value: 95,
-          },
-          {
-            name: "部门2",
-            value: 90,
-          },
-          {
-            name: "部门3",
-            value: 98,
-          },
-          {
-            name: "部门4",
-            value: 91,
-          },
-          {
-            name: "部门5",
-            value: 80,
-          },
-          {
-            name: "部门6",
-            value: 92,
-          },
-          {
-            name: "部门7",
-            value: 93,
-          },
-          {
-            name: "部门8",
-            value: 94,
-          },
-          {
-            name: "部门9",
-            value: 90,
-          },
-          {
-            name: "部门10",
-            value: 100,
-          },
-        ],
-      },
-      personConfig: {
-        data: [
-          {
-            name: "个人1",
-            value: 95,
-          },
-          {
-            name: "个人2",
-            value: 90,
-          },
-          {
-            name: "个人3",
-            value: 98,
-          },
-          {
-            name: "个人4",
-            value: 91,
-          },
-          {
-            name: "个人5",
-            value: 80,
-          },
-          {
-            name: "个人6",
-            value: 92,
-          },
-          {
-            name: "个人7",
-            value: 93,
-          },
-          {
-            name: "个人8",
-            value: 94,
-          },
-          {
-            name: "个人9",
-            value: 90,
-          },
-          {
-            name: "个人10",
-            value: 100,
-          },
-        ],
-      },
+      config: {},//部门绩效总分top10
+      personConfig: {},//个人绩效总分top10
       cricleData: [
         { value: 756, name: "考勤绩效" },
         { value: 690, name: "评价绩效" },
         { value: 559, name: "办件绩效" },
         { value: 1278, name: "效能绩效" },
       ],
+      // 个人绩效总分排名
+      staffQuery:{
+        page:1,
+        size:10,
+      },
+      // 部门
+      depQuery:{
+        page:1,
+        size:10,
+      },
     };
   },
 
@@ -326,9 +250,48 @@ export default {
     this.drawRulePie();
     this.drawCorePie();
     this.drawRecordPie();
+
+    this.staffStatList()
+    this.depStatList()
   },
 
   methods: {
+    // 个人绩效总分排名
+    staffStatList(){
+      this.$post("/staff/perform/stat/list", this.staffQuery).then((res) => {
+        const {code,data} = res
+        if(code == 1){
+          const row = data.data || []
+          const depArr = []
+          row.forEach(element => {
+            depArr.push({
+              name:element.staffName,
+              value:element.totalScore
+            })
+          });
+          this.personConfig = {data:depArr}
+          console.log(row,"个人")
+        }
+      });
+    },
+    // 部门绩效总分排名
+    depStatList(){
+      this.$post("/dept/perform/stat/list", this.depQuery).then((res) => {
+        const {code,data} = res
+        if(code == 1){
+          const row = data.data || []
+          const depArr = []
+          row.forEach(element => {
+            depArr.push({
+              name:element.deptName,
+              value:element.totalScore
+            })
+          });
+          this.config = {data:depArr}
+          // console.log(row,depArr,"部门")
+        }
+      });
+    },
     drawLeiDa() {
       // 基于dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("leida"));

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue

@@ -367,9 +367,9 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span>不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
               } else {
-                return <span style="cursor:pointer">选择</span>;
+                return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }
             },
           },

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue

@@ -407,9 +407,9 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span>不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
               } else {
-                return <span style="cursor:pointer">选择</span>;
+                return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }
             },
           },

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

@@ -12,7 +12,7 @@
               + {{ type == 1 ? "新增考核部门" : "新增考核个人" }}</el-button
             >
           </div>
-          <div class="mid_content">
+          <div class="mid_content" style="height: auto;">
             <div class="goal_box" v-for="(val, i) in dataList" :key="i">
               <div class="goal_title">
                 <img src="../../../../assets/images/u17641.svg" alt="" />
@@ -321,7 +321,7 @@ export default {
         box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
         -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
         -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
-        margin: 0 20px 20px 0;
+        margin: 10px 20px 10px 20px;
         padding: 20px;
         .goal_title {
           width: 100%;

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue

@@ -193,9 +193,9 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span>不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
               } else {
-                return <span style="cursor:pointer">选择</span>;
+                return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }
             },
           },

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

@@ -224,7 +224,7 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element.totalScore)
           });
           this.depStatObj.totalScore.x = x
@@ -241,13 +241,30 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element.attendScoreAdd)
           });
           this.depStatObj.attendScoreAdd.x = x
           this.depStatObj.attendScoreAdd.y = y
         }
       });
+      // 减分
+      const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
+      this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+        const {code,data,dict} = res
+        if(code == 1){
+          const row = data.data || []
+          // this.statArr = row
+          const x = []
+          const y = []
+          row.forEach(element => {
+            x.push(element.staffName)
+            y.push(element.totalSubScore)
+          });
+          this.depStatObj.totalSubScore.x = x
+          this.depStatObj.totalSubScore.y = y
+        }
+      });
     },
     // 部门绩效分数统计
     statList(){
@@ -274,7 +291,7 @@ export default {
       });
       // 加分top10
       const top10 = {...this.boardQuery,size:10,orderColList:[{colName:'totalAddScore',sortKind:'desc'}]}
-      this.$post("/staff/perform/stat/list", top10).then((res) => {
+      this.$post("/dept/perform/stat/list", top10).then((res) => {
         const {code,data,dict} = res
         if(code == 1){
           const row = data.data || []
@@ -292,7 +309,7 @@ export default {
       });
       // 减分
       const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
-      this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+      this.$post("/dept/perform/stat/list", top10Sub).then((res) => {
         const {code,data,dict} = res
         if(code == 1){
           const row = data.data || []
@@ -334,7 +351,7 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element[this.value])
           });
           this.depStatObj.alignment.x = x

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

 <template>
     <!-- 弹出框表单 -->
-    <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+        <div class="userName">
+            <div class="user-left">
+                <div class="user-name">
+                    {{ form.staffName }}
+                </div>
+                <div class="user-info">
+                    <span class="user-i">工号：{{ form.workNum }}</span>
+                    <span class="user-i">所属部门：{{ form.deptName }}</span>
+                </div>
+            </div>
+            <div class="user-right">
+                <div class="n">{{form.totalScore}}</div>
+                <div class="m">{{ form.month }}月得分</div>
+            </div>
+        </div>
+        <div class="userName user-t-item " :class="{t2:item.subAddType == 1,t1:item.subAddType == 2}" v-for="(item) in list" :key="item.id">
+            <div class="user-left">
+                <div class="user-name">
+                    {{dictVal('checkType',item.checkType)}}
+                </div>
+                <div class="user-info">
+                    <span class="user-i">绩效规则：{{item.ruleName}}</span>
+                </div>
+                <div class="user-info">
+                    <span class="user-i">核查时间：{{momentVal(item.checkTime)}}</span>
+                </div>
+            </div>
+            <div class="user-right">
+                <div class="n">{{item.subAddType==1?'+':'-'}}{{item.score}}</div>
+            </div>
+        </div>
+        <!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id"/>
-                            <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
-                            <Field label="人员名称" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入人员名称"/>
-                            <Field label="部门id号" prop="deptId" v-model="form.deptId" placeholder="请输入部门id号"/>
-                            <Field label="部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入部门名称"/>
-                            <Field label="考勤绩效指标分数" prop="attendScore" v-model="form.attendScore" placeholder="请输入考勤绩效指标分数"/>
-                            <Field label="评价绩效指标分数" prop="assessScore" v-model="form.assessScore" placeholder="请输入评价绩效指标分数"/>
-                            <Field label="办件绩效分数" prop="workScore" v-model="form.workScore" placeholder="请输入办件绩效分数"/>
-                            <Field label="效能绩效分数" prop="effectScore" v-model="form.effectScore" placeholder="请输入效能绩效分数"/>
-                            <Field label="其它绩效分数" prop="otherScore" v-model="form.otherScore" placeholder="请输入其它绩效分数"/>
-                            <Field label="累计异常分数" prop="errorScore" v-model="form.errorScore" placeholder="请输入累计异常分数"/>
-                            <Field label="当月得分数" prop="totalScore" v-model="form.totalScore" placeholder="请输入当月得分数"/>
-                            <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
-                            <Field label="年" prop="year" v-model="form.year" placeholder="请输入年"/>
-                            <Field label="月" prop="month" v-model="form.month" type="select" :enumData="dict.month" placeholder="请选择月"/>
+                <Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id" />
+                <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号" />
+                <Field label="人员名称" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入人员名称" />
+                <Field label="部门id号" prop="deptId" v-model="form.deptId" placeholder="请输入部门id号" />
+                <Field label="部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入部门名称" />
+                <Field label="考勤绩效指标分数" prop="attendScore" v-model="form.attendScore" placeholder="请输入考勤绩效指标分数" />
+                <Field label="评价绩效指标分数" prop="assessScore" v-model="form.assessScore" placeholder="请输入评价绩效指标分数" />
+                <Field label="办件绩效分数" prop="workScore" v-model="form.workScore" placeholder="请输入办件绩效分数" />
+                <Field label="效能绩效分数" prop="effectScore" v-model="form.effectScore" placeholder="请输入效能绩效分数" />
+                <Field label="其它绩效分数" prop="otherScore" v-model="form.otherScore" placeholder="请输入其它绩效分数" />
+                <Field label="累计异常分数" prop="errorScore" v-model="form.errorScore" placeholder="请输入累计异常分数" />
+                <Field label="当月得分数" prop="totalScore" v-model="form.totalScore" placeholder="请输入当月得分数" />
+                <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注" />
+                <Field label="年" prop="year" v-model="form.year" placeholder="请输入年" />
+                <Field label="月" prop="month" v-model="form.month" type="select" :enumData="dict.month"
+                    placeholder="请选择月" />
 
             </el-row>
 
-        </el-form>
+        </el-form> -->
         <div slot="footer" class="dialog-footer">
             <el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button>
             <el-button @click="cancel">取 消</el-button>
@@ -30,12 +62,13 @@
 </template>
 
 <script>
-    import form from "@/assets/mixins/formdialog";
-    import dialogShow from "./dialogshow";
-    export default {
+import form from "@/assets/mixins/formdialog";
+import dialogShow from "./dialogshow";
+import moment from "moment";
+export default {
     mixins: [form],
     components: {
-            dialogShow ,
+        dialogShow,
     },
     data() {
         return {
@@ -45,29 +78,52 @@
             title: "员工绩效统计",
             // 是否显示弹出层
             open: false,
-                toString:[
+            toString: [
                 "month",
             ],
             // 表单校验
             rules: {
                 year: [
-                        {required: true,message: "请输入年", trigger: "blur" },
+                    { required: true, message: "请输入年", trigger: "blur" },
                 ],
                 month: [
-                        {required: true,message: "请输入月", trigger: "blur" },
+                    { required: true, message: "请输入月", trigger: "blur" },
                 ],
-                }
+            },
+            list:[],
+            dict:{}
         };
     },
 
     methods: {
+        // 日期
+        momentVal(v){
+            return moment(v).format('YYYY-MM-DD HH:SS')
+        },
+        // 字典转换
+        dictVal(key,val){
+            return this.dict[key][val]
+        },
+        /** 查看汇总 */
+        checkAll(id) {
+            this.$post("/check/all/record/list", {checkStatus:2,staffId:id}).then((res) => {
+                const { code, data, dict } = res
+                if (code == 1) {
+                    const row = data.data || []
+                    //deductTime申诉时间 checkTime 核查时间 ruleName规则checkType字典 subAddType：1增加2减score
+                    this.list = row
+                    this.dict = dict
+                    console.log(row,dict,"22222222222")
+                }
+            });
+        },
         /** 编辑 */
         edit(row) {
             this.reset()
             this.query = { id: row.id };
-                this.urls.currUrl ="staff/perform/summary/edit";
+            this.urls.currUrl = "staff/perform/summary/edit";
             this.getData();
-                this.pageInfo.type="edit"
+            this.pageInfo.type = "edit"
             this.title = "修改员工绩效统计";
         },
         /** 新增 */
@@ -75,17 +131,18 @@
             this.reset()
             this.urls.currUrl = "staff/perform/summary/add";
             this.getData();
-                this.pageInfo.type="add"
+            this.pageInfo.type = "add"
             this.title = "新增员工绩效统计";
         },
         /** 查看*/
         view(row) {
             this.reset()
             this.query = { id: row.id };
-                this.urls.currUrl ="staff/perform/summary/view";
+            this.urls.currUrl = "staff/perform/summary/view";
             this.getData();
-                this.pageInfo.type="view"
+            this.pageInfo.type = "view"
             this.title = "员工绩效统计详细";
+            this.checkAll(row.staffId)
         },
         /**取消按钮 */
         cancel() {
@@ -104,21 +161,21 @@
         // 表单重置
         reset() {
             this.form = {
-                    staffId : 0,
-                    workNum : "",
-                    staffName : "",
-                    deptId : 0,
-                    deptName : "",
-                    attendScore : null,
-                    assessScore : null,
-                    workScore : null,
-                    effectScore : null,
-                    otherScore : null,
-                    errorScore : null,
-                    totalScore : null,
-                    remark : "",
-                    year : null,
-                    month : null,
+                staffId: 0,
+                workNum: "",
+                staffName: "",
+                deptId: 0,
+                deptName: "",
+                attendScore: null,
+                assessScore: null,
+                workScore: null,
+                effectScore: null,
+                otherScore: null,
+                errorScore: null,
+                totalScore: null,
+                remark: "",
+                year: null,
+                month: null,
             };
             this.resetForm("form");
         },
@@ -128,5 +185,67 @@
             }
         },
     },
-    };
+};
 </script>
+<style lang="less" scoped>
+.userName {
+    background: rgba(242, 246, 252, 1);
+    display: flex;
+    align-items: center;
+    padding: 15px;
+
+    .user-left {
+        flex: 1;
+    }
+
+    .user-name {
+        font-size: 18px;
+        font-weight: bold;
+    }
+
+    .user-info {
+        margin-top: 10px;
+
+        .user-i {
+            margin-right: 40px;
+        }
+    }
+
+    .user-right {
+        text-align: center;
+
+        .n {
+            font-size: 16px;
+            font-weight: bold;
+        }
+
+        .m {
+            font-size: 12px;
+        }
+    }
+}
+
+.user-t-item {
+    margin-top: 20px;
+    border-left: 4px solid #FF4242;
+}
+
+.t1 {
+    border-color: #FF4242;
+    background: rgba(255, 66, 66, 0.07);
+
+    .user-name,
+    .n {
+        color: #FF4242;
+    }
+}
+.t2 {
+    border-color: rgba(27, 198, 167, 1);
+    background: rgba(27, 198, 167, 0.07);
+
+    .user-name,
+    .n {
+        color: rgba(27, 198, 167, 1);
+    }
+}
+</style>
\ No newline at end of file

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

@@ -21,8 +21,6 @@ public abstract class BaseReq implements Serializable {
 
 
 
-
-
     /**
      * 工号
      */
@@ -42,6 +40,9 @@ public abstract class BaseReq implements Serializable {
      * 规则编码
      */
     private String ruleCode;
+
+    private Long ruleId;
+
     private String phone;
 
 
@@ -51,4 +52,7 @@ public abstract class BaseReq implements Serializable {
     private String performType;
 
 
+    private Long staffId;
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java

@@ -13,6 +13,8 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.xhx.busiz.dingtalk.config.TalkConfiguration;
 import com.mortals.xhx.busiz.dingtalk.req.DingTalkBaseReq;
 import com.mortals.xhx.busiz.dingtalk.req.UserPageReq;
+import com.mortals.xhx.busiz.req.CodeReq;
+import com.mortals.xhx.busiz.req.LinkMessageReq;
 import com.mortals.xhx.busiz.req.MobileReq;
 import com.mortals.xhx.busiz.req.ReviewSaveReq;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -131,9 +133,9 @@ public class TalkApiController {
             if(dingToken == null){
                 dingToken = getToken().getData();
             }
-            req.setDeptId(res.getDeptid());
-            req.setCursor(res.getCursor());
-            req.setSize(res.getSize());
+            req.setDeptId(res.getDeptid());   //部门id
+            req.setCursor(res.getCursor());   //起始页游标
+            req.setSize(res.getSize());    //分页条数
             OapiV2UserListResponse rsp = client.execute(req, dingToken);
             if(rsp.getErrcode() == 0){
                 apiRespPdu.setCode(0);
@@ -173,11 +175,12 @@ public class TalkApiController {
             if(dingToken == null){
                 dingToken = getToken().getData();
             }
-            req.setMobile(mobile.getMobile());
+            req.setMobile(mobile.getMobile());   //用户手机号
+            //先根据手机号去获取userid  再通过userid获取详情    钉钉没有直接根据电话获取用户详情的接口
             OapiV2UserGetbymobileResponse rsp = client.execute(req, dingToken);
             if(rsp.getErrcode() == 0){
                 //根据获取到的userid去获取用户详情
-                ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> userRsp = getUserInfo(rsp.getResult().getUserid());
+                ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> userRsp = getUserInfoByUserId(rsp.getResult().getUserid());
                 if(userRsp.getCode() == 0){
                     apiRespPdu.setCode(userRsp.getCode());
                     apiRespPdu.setData(userRsp.getData());
@@ -211,17 +214,17 @@ public class TalkApiController {
      * 根据userid查询用户详情
      * @return
      */
-    @GetMapping("/dingtalk/getUserInfo")
+    @GetMapping("/dingtalk/getUserInfoByUserId")
     @UnAuth
-    public ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> getUserInfo(@RequestBody String userid){
+    public ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> getUserInfoByUserId(@RequestBody String userid){
         ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> apiRespPdu = new ApiRespPdu<>();
         try {
-            DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfo());
+            DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfobyuserid());
             OapiV2UserGetRequest req = new OapiV2UserGetRequest();
             if(dingToken == null){
                 dingToken = getToken().getData();
             }
-            req.setUserid(userid);
+            req.setUserid(userid);   //用户id
             OapiV2UserGetResponse rsp = client.execute(req, dingToken);
 
             apiRespPdu.setCode(0);
@@ -236,4 +239,85 @@ public class TalkApiController {
 
         return apiRespPdu;
     }
+
+
+    /**
+     * 推送链接类钉钉工作消息
+     * @return
+     */
+    @PostMapping("/dingtalk/sendLinkMessage")
+    @UnAuth
+    public ApiRespPdu<String> sendLinkMessage(@RequestBody LinkMessageReq linkMessageReq){
+        ApiRespPdu<String> apiRespPdu = new ApiRespPdu<>();
+        try {
+            DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getSendmessage());
+            if(dingToken == null){
+                dingToken = getToken().getData();
+            }
+            OapiMessageCorpconversationAsyncsendV2Request req = new OapiMessageCorpconversationAsyncsendV2Request();
+            req.setAgentId(Long.valueOf(talkConfiguration.getGetAgentId()));
+            req.setUseridList(linkMessageReq.getUserIdList());
+
+            OapiMessageCorpconversationAsyncsendV2Request.Msg obj1 = new OapiMessageCorpconversationAsyncsendV2Request.Msg();
+            obj1.setMsgtype("link");   //type为链接类消息
+            OapiMessageCorpconversationAsyncsendV2Request.Link obj2 = new OapiMessageCorpconversationAsyncsendV2Request.Link();
+            obj2.setPicUrl(linkMessageReq.getPicUrl());    //消息图片地址
+            obj2.setMessageUrl(linkMessageReq.getMessageUrl());  //跳转链接地址
+            obj2.setText(linkMessageReq.getText());    //消息描述
+            obj2.setTitle(linkMessageReq.getTitle());   //消息title
+            obj1.setLink(obj2);
+            req.setMsg(obj1);
+
+            OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(req, dingToken);
+            if(rsp.getErrcode() == 0){
+                apiRespPdu.setCode(0);
+                apiRespPdu.setData(rsp.getBody());
+                apiRespPdu.setMsg(rsp.getMsg());
+            }else {
+                apiRespPdu.setCode(-1);
+                apiRespPdu.setData(rsp.getBody());
+                apiRespPdu.setMsg(rsp.getMsg());
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            apiRespPdu.setCode(-1);
+            apiRespPdu.setData("");
+            apiRespPdu.setMsg(e.toString());
+        }
+
+        return apiRespPdu;
+    }
+
+
+    /**
+     * 根据免登码查询用户详情
+     * @return
+     */
+    @GetMapping("/dingtalk/getUserInfoByCode")
+    @UnAuth
+    public ApiRespPdu<OapiV2UserGetuserinfoResponse.UserGetByCodeResponse> getUserInfoByCode(@RequestBody CodeReq codeReq){
+        ApiRespPdu<OapiV2UserGetuserinfoResponse.UserGetByCodeResponse> apiRespPdu = new ApiRespPdu<>();
+        try {
+            DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfobycode());
+            OapiV2UserGetuserinfoRequest req = new OapiV2UserGetuserinfoRequest();
+            if(dingToken == null){
+                dingToken = getToken().getData();
+            }
+            req.setCode(codeReq.getCode());    //前端js获取到的免登码  用免登码获取用户信息
+            OapiV2UserGetuserinfoResponse rsp = client.execute(req, dingToken);
+
+            apiRespPdu.setCode(0);
+            apiRespPdu.setData(rsp.getResult());
+            apiRespPdu.setMsg(rsp.getMsg());
+        } catch (Exception e) {
+            e.printStackTrace();
+            apiRespPdu.setCode(-1);
+            apiRespPdu.setData(null);
+            apiRespPdu.setMsg(e.toString());
+        }
+
+        return apiRespPdu;
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/config/TalkConfiguration.java

@@ -58,8 +58,21 @@ public class TalkConfiguration {
     /**
      * 根据userid查询用户信息
      */
-    @Value("${dingtalk.getuserinfo:https://oapi.dingtalk.com/topapi/v2/user/get}")
-    private String getuserinfo;
+    @Value("${dingtalk.getuserinfobyuserid:https://oapi.dingtalk.com/topapi/v2/user/get}")
+    private String getuserinfobyuserid;
+
+    /**
+     * 根据免登码查询用户信息
+     */
+    @Value("${dingtalk.getuserinfobycode:https://oapi.dingtalk.com/topapi/v2/user/getuserinfo}")
+    private String getuserinfobycode;
+
+    /**
+     * 推送钉钉工作消息
+     */
+    @Value("${dingtalk.sendmessage:https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2}")
+    private String sendmessage;
+
     /**
      * getDeptbyUser
      */

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

+package com.mortals.xhx.busiz.req;
+
+/**
+ * @author ZYW
+ * @date 2023-07-13 20:11
+ */
+
+public class CodeReq {
+    String code;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

@@ -9,6 +9,7 @@ import java.util.Date;
 
 @Data
 public class InspectSaveReq extends BaseReq {
+    //考勤
     /**
      * 所属考勤组ID
      */
@@ -42,8 +43,116 @@ public class InspectSaveReq extends BaseReq {
      */
     private String errorResult;
 
+//评价
+    /**
+     * 评价结果(1.非常不满意,2.差评)
+     */
+    private Integer reviewResult;
+    /**
+     * 评价时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reviewTime;
+    /**
+     * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
+     */
+    private String reviewSource;
+    /**
+     * 评价设备
+     */
+    private String reviewDevice;
+
+    //投诉
+
+    /**
+     * 投诉标题
+     */
+    private String complainTitle;
+    /**
+     * 投诉内容
+     */
+    private String complainContent;
+    /**
+     * 投诉人真实姓名
+     */
+    private String complainRealName;
+    /**
+     * 联系电话
+     */
+    private String contact;
+    /**
+     * 投诉时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date complainTime;
+    /**
+     * 投诉来源
+     */
+    private String complainSource;
+    /**
+     * 投诉设备
+     */
+    private String complainDevice;
+
+   //办件
+    /**
+     * 办件编码
+     */
+    private String goworkCode;
+    /**
+     * 办件所属部门
+     */
+    private String goworkDepts;
+    /**
+     * 事项名称
+     */
+    private String matterlName;
+    /**
+     * 办理时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date goworkTime;
+
+
+  //效能
+
+    /**
+     * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
+     */
+    private Integer irregularType;
+    /**
+     * 发生时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date happenTime;
+    /**
+     * 持续时间，秒
+     */
+    private Integer duration;
+    /**
+     * 报警时间
+     */
+    private Date alarmTime;
+
+    //其它
+
+    /**
+     * 违规类型(1.工作纪律)
+     */
+    private Integer irregularOtherType;
+//    /**
+//     * 发生时间
+//     */
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date happenTime;
+
+    /**
+     * 评分标准
+     */
+    private String ruleDesc;
 
 
 
+    private  Long checkRecordId;
 
 }

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

+package com.mortals.xhx.busiz.req;
+
+/**
+ * @author ZYW
+ * @date 2023-07-13 19:30
+ * 连接类工作消息
+ */
+
+public class LinkMessageReq {
+    String userIdList;   //接收者用户id列表   多个接收者用,隔开
+    String picUrl;   //消息图片地址
+    String messageUrl;   //链接地址
+    String title;   //消息标题，建议100字符以内。
+    String text;      //消息描述，建议500字符以内。
+
+    public String getUserIdList() {
+        return userIdList;
+    }
+
+    public void setUserIdList(String userIdList) {
+        this.userIdList = userIdList;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getMessageUrl() {
+        return messageUrl;
+    }
+
+    public void setMessageUrl(String messageUrl) {
+        this.messageUrl = messageUrl;
+    }
+}

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

@@ -19,5 +19,9 @@ public class PerformReq extends BaseReq {
 
     private Long id;
 
+    private Integer processStatus;
+
+    private Integer scoreType;
+
 
 }

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

@@ -18,7 +18,7 @@ public class ReviewSaveReq extends BaseReq {
      * 评价时间
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date reviewTime;
+    private String reviewTime;
     /**
      * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
      */

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

+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InspectStatInfo {
+
+    /**
+     * 累计次数
+     */
+    private Integer totalTimes;
+
+
+    /**
+     * 今日次数
+     */
+    private Integer todayTimes;
+
+}

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

@@ -217,4 +217,8 @@ public class PerformDetailInfo {
     private Integer irregularOtherType;
 
 
+    /**
+     * 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
+     */
+    private Integer appealStatus;
 }

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

@@ -63,13 +63,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部考勤新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = attend(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -90,13 +88,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部评价新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = review(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -117,13 +113,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部投诉新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = complain(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -144,13 +138,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部办件新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = gowork(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -171,13 +163,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部效能新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = effect(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -198,13 +188,11 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部其它绩效新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = other(req);
-            if (!bool) throw new AppException(busiDesc + "失败！");
+            if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
             log.error(busiDesc, e);
             return Rest.fail(e.getMessage());
@@ -225,7 +213,8 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
-
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
 
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
@@ -233,7 +222,8 @@ public class                ApiWebPerformController extends AbstractBaseControll
         recordEntity.setRuleNme(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformAttendRecordEntity save = attendRecordService.save(recordEntity);
@@ -254,13 +244,16 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
@@ -279,12 +272,16 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
 
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
@@ -304,12 +301,16 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
 
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
@@ -329,12 +330,16 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
 
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
@@ -354,6 +359,8 @@ public class                ApiWebPerformController extends AbstractBaseControll
         BeanUtils.copyProperties(req, recordEntity);
         recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -361,6 +368,9 @@ public class                ApiWebPerformController extends AbstractBaseControll
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
 
+        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductTime(new Date());
+
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformOtherRecordEntity save = otherRecordService.save(recordEntity);

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

@@ -176,6 +176,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
         try {
+            if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+                throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+            }
             //根据状态 查询 当前是否已经存在正在进行的申诉
             if (ObjectUtils.isEmpty(req.getId())) throw new AppException("核查记录Id不能为空！");
             if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("绩效类型不能为空！");
@@ -218,6 +221,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
             entity.setProcessStatus(1);
             entity.setAppealDesc(req.getAppealDesc());
+            entity.setStaffId(context.getUser().getCustomerId());
+            entity.setCreateUserId(context.getUser().getId());
+
             PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
             rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");

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

@@ -105,6 +105,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
             model.put(PAGEINFO_KEY, pageAllInfo);
             parsePageInfo(model, pageAllInfo);
 
+            rest.setData(model);
+
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);

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

@@ -7,17 +7,21 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.xhx.busiz.req.AppealReq;
-import com.mortals.xhx.busiz.req.PerformReq;
-import com.mortals.xhx.busiz.rsp.AppealStatInfo;
+import com.mortals.xhx.busiz.req.*;
+import com.mortals.xhx.busiz.rsp.*;
 import com.mortals.xhx.common.code.PerformTypeEnum;
 import com.mortals.xhx.common.code.ProcessStatusEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.*;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
 import com.mortals.xhx.module.check.service.*;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
-import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
+import com.mortals.xhx.module.perform.model.*;
+import com.mortals.xhx.module.perform.service.*;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.*;
 import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
@@ -47,6 +53,27 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RequestMapping("/api/v1/inspect")
 public class InspectApiController 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;
+    @Autowired
+    private StaffService staffService;
+
+    @Autowired
+    private CheckAllRecordService checkAllRecordService;
+
+
     @Autowired
     private CheckAttendRecordService checkAttendRecordService;
     @Autowired
@@ -61,30 +88,117 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     private CheckOtherRecordService checkOtherRecordService;
 
 
-    @Autowired
-    private PerformAttendAppealService appealService;
-
 
     /**
-     * 个人申诉绩效统计
+     * 个人巡查效统计
      */
     @PostMapping(value = "stat")
-    public Rest<AppealStatInfo> appealStat() {
-        String busiDesc = "H5个人申诉绩效统计";
-        Rest<AppealStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
+    public Rest<InspectStatInfo> inspectStat() {
+        String busiDesc = "H5 个人巡查统计";
+        Rest<InspectStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
+
         if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
             throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
         }
         log.info("【{}】【请求体】--> 用户:{}", busiDesc, context.getUser().getRealName());
         try {
-            //todo 查询当前登录人的绩效分数
-            AppealStatInfo appealStatInfo = new AppealStatInfo();
-            appealStatInfo.setTotalScore(new BigDecimal("10.52"));
-            appealStatInfo.setTotalTimes(12);
-            appealStatInfo.setTodayScore(new BigDecimal("2.5"));
-            appealStatInfo.setTodayTimes(3);
-            rest.setData(appealStatInfo);
+            //todo
+            InspectStatInfo performStatInfo = new InspectStatInfo();
+            performStatInfo.setTotalTimes(12);
+            performStatInfo.setTodayTimes(4);
+            rest.setData(performStatInfo);
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 个人巡查列表
+     */
+    @PostMapping(value = "list")
+    public Rest<Object> performList(@RequestBody PerformReq performReq) {
+        String busiDesc = "个人巡查列表";
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
+        Rest<Object> rest = Rest.ok();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+
+        if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+            throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+        }
+        try {
+            if (ObjectUtils.isEmpty(performReq.getPerformStartDate())) {
+                //未设置时间的情况，默认为当月
+                performReq.setPerformStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+                performReq.setPerformEndDate(DateUtil.today());
+            } else {
+                performReq.setPerformStartDate(DateUtil.beginOfMonth(DateUtil.parse(performReq.getPerformStartDate()).toJdkDate()).toDateStr());
+                performReq.setPerformEndDate(DateUtil.endOfMonth(DateUtil.parse(performReq.getPerformStartDate()).toJdkDate()).toDateStr());
+            }
+            CheckAllRecordQuery query = new CheckAllRecordQuery();
+            query.setCheckTimeStart(performReq.getPerformStartDate());
+            query.setCheckTimeEnd(performReq.getPerformEndDate());
+            query.setCreateUserId(context.getUser().getCustomerId());
+            if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
+                List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+                List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+                    PerformInfo performInfo = new PerformInfo();
+                    BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+                    return performInfo;
+                }).collect(Collectors.toList());
+                model.put(KEY_RESULT_DATA, collect);
+                PageInfo pageAllInfo = new PageInfo();
+                pageAllInfo.setTotalResult(collect.size());
+                pageAllInfo.setCurrPage(1);
+                pageAllInfo.setPrePageResult(-1);
+                model.put(PAGEINFO_KEY, pageAllInfo);
+                parsePageInfo(model, pageAllInfo);
+
+            }
+            if(!ObjectUtils.isEmpty(performReq.getProcessStatus())){
+                query.setCheckStatus(performReq.getProcessStatus());
+                List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+                List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+                    PerformInfo performInfo = new PerformInfo();
+                    BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+                    return performInfo;
+                }).collect(Collectors.toList());
+                model.put(KEY_RESULT_DATA, collect);
+                PageInfo pageAllInfo = new PageInfo();
+                pageAllInfo.setTotalResult(collect.size());
+                pageAllInfo.setCurrPage(1);
+                pageAllInfo.setPrePageResult(-1);
+                model.put(PAGEINFO_KEY, pageAllInfo);
+                parsePageInfo(model, pageAllInfo);
+            }
+            if(!ObjectUtils.isEmpty(performReq.getScoreType())){
+                query.setSubMethod(performReq.getScoreType());
+                List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+                List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+                    PerformInfo performInfo = new PerformInfo();
+                    BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+                    return performInfo;
+                }).collect(Collectors.toList());
+                model.put(KEY_RESULT_DATA, collect);
+                PageInfo pageAllInfo = new PageInfo();
+                pageAllInfo.setTotalResult(collect.size());
+                pageAllInfo.setCurrPage(1);
+                pageAllInfo.setPrePageResult(-1);
+                model.put(PAGEINFO_KEY, pageAllInfo);
+                parsePageInfo(model, pageAllInfo);
+            }
+
+
+//            model.put(KEY_RESULT_DATA, result.getList());
+//            model.put(PAGEINFO_KEY, result.getPageInfo());
+//            parsePageInfo(model, result.getPageInfo());
+
+            rest.setData(model);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
@@ -98,56 +212,40 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
      * 巡查新增
      */
     @PostMapping(value = "save")
-    public Rest<PerformAttendAppealEntity> appealSave(@RequestBody AppealReq req) {
-        String busiDesc = "个人申诉新增";
+    public Rest<PerformAttendAppealEntity> appealSave(@RequestBody InspectSaveReq req) {
+        String busiDesc = "个人巡查记录新增";
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(req));
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
+       // req.setStaffId(context.getUser().getCustomerId());
         try {
             //根据状态 查询 当前是否已经存在正在进行的申诉
-            if (ObjectUtils.isEmpty(req.getId())) throw new AppException("核查记录Id不能为空！");
-            if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("绩效类型不能为空！");
-            //查询当前核查是否已存在进行中的申诉记录
-            PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(req.getId()));
-            if (!ObjectUtils.isEmpty(appealEntity) && appealEntity.getProcessStatus() == ProcessStatusEnum.未处理.getValue()) {
-                throw new AppException("当前绩效核查已经存在正在进行中的申诉记录！");
+            if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+                throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
             }
-            PerformAttendAppealEntity entity = new PerformAttendAppealEntity();
-            entity.initAttrValue();
+            if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("绩效类型不能为空！");
 
             if (PerformTypeEnum.考勤绩效.getValue().equals(req.getPerformType())) {
-                CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = attend(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(req.getPerformType())) {
-                CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = review(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(req.getPerformType())) {
-                CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = complain(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else if (PerformTypeEnum.办件绩效.getValue().equals(req.getPerformType())) {
-                CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = gowork(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else if (PerformTypeEnum.效能绩效.getValue().equals(req.getPerformType())) {
-                CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = effect(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else if (PerformTypeEnum.其它绩效.getValue().equals(req.getPerformType())) {
-                CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(req.getId(), context);
-                BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+                boolean bool = other(req,context);
+                if (bool) throw new AppException(busiDesc + "失败！");
             } else {
                 throw new AppException("不支持当前绩效类型");
             }
-            entity.setPerformType(req.getPerformType());
-            entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
-            entity.setProcessStatus(1);
-            entity.setAppealDesc(req.getAppealDesc());
-            PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
-            rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
@@ -158,17 +256,242 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     }
 
 
-    protected PageInfo buildPageInfo(AppealReq query) {
-        PageInfo pageInfo = new PageInfo();
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
-            pageInfo.setCurrPage(query.getPage());
+
+
+
+    private boolean attend(InspectSaveReq req,Context context) throws AppException {
+        //考勤保存
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+
+        PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+        recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleNme(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+
+        recordEntity.setCreateUserId(context.getUser().getCustomerId());
+        recordEntity.setCreateTime(new Date());
+        PerformAttendRecordEntity save = attendRecordService.save(recordEntity);
+
+        return save.newEntity();
+
+    }
+
+
+    private boolean review(InspectSaveReq req,Context context) throws AppException {
+        //评价保存
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+        PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+      //  recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+        recordEntity.setCreateUserId(context.getUser().getCustomerId());
+        recordEntity.setCreateTime(new Date());
+        PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
+        return save.newEntity();
+
+    }
+
+    private boolean complain(InspectSaveReq req,Context context) throws AppException {
+        //投诉保存
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+        PerformComplainRecordEntity recordEntity = new PerformComplainRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+       // recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+        recordEntity.setDeductTime(new Date());
+
+        recordEntity.setCreateUserId(context.getUser().getCustomerId());
+        recordEntity.setCreateTime(new Date());
+        PerformComplainRecordEntity save = complainRecordService.save(recordEntity);
+        return save.newEntity();
+
+    }
+
+    private boolean gowork(InspectSaveReq req,Context context) throws AppException {
+        //办件保存
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+        PerformGoworkRecordEntity recordEntity = new PerformGoworkRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+       // recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+        recordEntity.setCreateUserId(1L);
+        recordEntity.setCreateTime(new Date());
+        PerformGoworkRecordEntity save = performGoworkRecordService.save(recordEntity);
+        return save.newEntity();
+
+    }
+
+    private boolean effect(InspectSaveReq req,Context context) throws AppException {
+        //效能保存
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+        PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+        //recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+        recordEntity.setCreateUserId(context.getUser().getCustomerId());
+        recordEntity.setCreateTime(new Date());
+        PerformEffectRecordEntity save = effectRecordService.save(recordEntity);
+        return save.newEntity();
+    }
+
+    private boolean other(InspectSaveReq req,Context context) throws AppException {
+        //其它保存
+
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+        PerformOtherRecordEntity recordEntity = new PerformOtherRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+        //recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+        recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+        recordEntity.setCreateUserId(context.getUser().getCustomerId());
+        recordEntity.setCreateTime(new Date());
+        PerformOtherRecordEntity save = otherRecordService.save(recordEntity);
+        return save.newEntity();
+    }
+
+    /**
+     * 详细
+     */
+    @PostMapping(value = "info")
+    public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
+        Context context = this.getContext();
+        String busiDesc = "个人巡查详细";
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
+        Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(performReq.getId())) {
+                throw new AppException("详细查询id不能为空!");
+            }
+            PerformDetailInfo performDetailInfo = new PerformDetailInfo();
+            if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
+                CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
+                CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(performReq.getPerformType())) {
+                CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else if (PerformTypeEnum.办件绩效.getValue().equals(performReq.getPerformType())) {
+                CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else if (PerformTypeEnum.效能绩效.getValue().equals(performReq.getPerformType())) {
+                CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else if (PerformTypeEnum.其它绩效.getValue().equals(performReq.getPerformType())) {
+                CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(performReq.getId(), context);
+                BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+            } else {
+                throw new AppException("不支持当前绩效类型");
+            }
+
+            rest.setData(performDetailInfo);
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
     }
 
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
-            pageInfo.setPrePageResult(query.getSize());
+    private PerformRulesEntity getRule(String ruleId) {
+        PerformRulesEntity rule = rulesService.getCache(ruleId);
+        if (ObjectUtils.isEmpty(rule))
+            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleId));
+
+        return rule;
     }
 
-        return pageInfo;
+
+    private StaffEntity getStaff(String staffId) {
+        StaffEntity staffEntity = staffService.getCache(staffId);
+        if (ObjectUtils.isEmpty(staffEntity))
+            throw new AppException(String.format("当前id未找到匹配的员工！staffId:%s", staffId));
+
+        return staffEntity;
     }
 
 

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

@@ -167,9 +167,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
-
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
 
@@ -190,9 +193,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
-
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -212,8 +219,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
 
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -232,8 +243,14 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
+
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -252,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -272,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -327,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
                 CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
@@ -346,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 throw new AppException("不支持当前绩效类型");
             }
 
+            PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
+            if (ObjectUtils.isEmpty(appealEntity)) {
+                performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+            } else {
+                if (ProcessStatusEnum.未处理.getValue() == appealEntity.getProcessStatus()) {
+                    performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
+                } else {
+                    if (AppealResultEnum.通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
+                    } else if (AppealResultEnum.不通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
+                    }
+                }
+            }
+
             rest.setData(performDetailInfo);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

@@ -23,21 +23,22 @@ public class TestController {
     @Autowired
     private IdgeneratorService idgeneratorService;
 
-    @GetMapping("webservice")
+//    @GetMapping("webservice")@GetMapping("idGens")
+//    public String idGens() {
+//        log.info("测试id生成");
+//
+//        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT).toString();
+//
+//
+//        return stringId;
+//    }
     public String webservice() {
         log.info("测试");
 
         return "ok";
     }
 
-    @GetMapping("idGens")
-    public String idGens() {
-        log.info("测试id生成");
-
-        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT_KEY).toString();
-
-        return stringId;
-    }
+//
 
 
 

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

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /***
- * 核查类型枚举(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
+ * 核查类型枚举(1.考勤绩效,2.评价绩效,3.办件绩效,4.效能绩效,5.其它绩效,6.投诉绩效)
  */
 public enum CheckTypeEnum {
     考勤绩效(1, "考勤绩效"),
@@ -12,6 +12,7 @@ public enum CheckTypeEnum {
     办件绩效(3, "办件绩效"),
     效能绩效(4, "效能绩效"),
     其它绩效(5, "其它绩效"),
+    投诉绩效(6, "投诉绩效"),
     ;
     private Integer value;
     private String desc;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java

@@ -69,4 +69,7 @@ public class CheckAllRecordVo extends BaseEntityLong {
      * 核查类型(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
      */
     private Integer checkType;
+
+
+    private String performType;
 }

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

 package com.mortals.xhx.module.check.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 考勤绩效记录核查信息
-*
-* @author zxfei
-* @date 2023-07-10
-*/
+ * 考勤绩效记录核查信息
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
 @RestController
 @RequestMapping("check/attend/record")
-public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService,CheckAttendRecordEntity,Long> {
+public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService, CheckAttendRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public CheckAttendRecordController(){
-        super.setModuleDesc( "考勤绩效记录核查信息");
+    public CheckAttendRecordController() {
+        super.setModuleDesc("考勤绩效记录核查信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord","subAddType"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord","checkStatus"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord","subMethod"));
+       this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 
+
+    @Override
+    protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+        super.doListBefore(query, model, context);
+    }
+
     /**
      * 审核
+     *
      * @param entity
      * @return
      */

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

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -42,12 +49,24 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckComplainRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckComplainRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckComplainRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

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

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -43,12 +50,25 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckEffectRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckEffectRecord","subAddType"));
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

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

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -42,12 +49,24 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckGoworkRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckGoworkRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckGoworkRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

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

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -43,12 +50,23 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckOtherRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckOtherRecord","subAddType"));
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

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

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -44,12 +51,25 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckReviewRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckReviewRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckReviewRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/FeedbackDao.java

@@ -21,10 +21,10 @@ public interface  FeedbackDao extends ICRUDDao<FeedbackEntity,Long>{
 
     /***
      * 问卷反馈人员列表
-     * @param feedbackId
+     * @param query
      * @return
      */
-    List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId);
+    Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo);
 
     /**
      * 问卷单选多选反馈统计

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/ibatis/FeedbackDaoImpl.java

@@ -28,8 +28,29 @@ public class FeedbackDaoImpl extends BaseCRUDDaoMybatis<FeedbackEntity,Long> imp
 
 
     @Override
-    public List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) {
-        return this.getSqlSession().selectList(this.getSqlId("getFeedbackStaffList"), feedbackId);
+    public Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) {
+        String sqlId = "getFeedbackStaffList";
+
+        Result result = new Result();
+        List list = null;
+        int count = this.getFeedbackStaffListCount(query);
+        if (count == 0) {
+            list = new ArrayList();
+        } else if (pageInfo.getPrePageResult() == -1) {
+            list = this.getSqlSession().selectList(this.getSqlId(sqlId), query);
+        } else {
+            if (pageInfo.getBeginIndex() > count) {
+                pageInfo.setCurrPage(1);
+            }
+
+            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+            list = this.getSqlSession().selectList(this.getSqlId(sqlId), query, rowBounds);
+        }
+
+        pageInfo.setTotalResult(count);
+        result.setPageInfo(pageInfo);
+        result.setList((List)list);
+        return result;
     }
 
     @Override
@@ -66,4 +87,8 @@ public class FeedbackDaoImpl extends BaseCRUDDaoMybatis<FeedbackEntity,Long> imp
     private int getQuestionAnswerListCount(Long questionId) {
         return (Integer)this.getSqlSession().selectOne(this.getSqlId("getQuestionAnswerListCount"), questionId);
     }
+
+    private int getFeedbackStaffListCount(FeedbackEntity query) {
+        return (Integer)this.getSqlSession().selectOne(this.getSqlId("getFeedbackStaffListCount"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackAnswerVo.java

@@ -15,5 +15,6 @@ import java.util.Date;
 */
 @Data
 public class FeedbackAnswerVo extends BaseEntityLong {
-
+    /** 问题内容**/
+    private String questionContent;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java

@@ -17,6 +17,10 @@ import java.util.Date;
 public class FeedbackVo extends BaseEntityLong {
 
     private List<Long> staffList;
-
+    /** 问题Id */
     private Long questionId;
+    /** 反馈Id */
+    private Long feedbackId;
+    /** 反馈状态 */
+    private Integer backStatus;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/OptionSummaryVo.java

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.feedback.model.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 问卷单选多选反馈统计视图
  */
@@ -36,4 +38,6 @@ public class OptionSummaryVo {
      * 选项统计
      */
     private Integer optionCount;
+
+    List<OptionSummaryVo> optionList;
 }

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

@@ -25,10 +25,10 @@ public interface FeedbackService extends ICRUDService<FeedbackEntity,Long>{
 
     /***
      * 问卷反馈人员列表
-     * @param feedbackId
+     * @param query
      * @return
      */
-    List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) throws AppException;
+    Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) throws AppException;
 
     /**
      * 问卷单选多选反馈统计

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

 package com.mortals.xhx.module.feedback.service.impl;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
+import com.mortals.xhx.module.feedback.service.FeedbackQuestionService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -27,6 +31,8 @@ import lombok.extern.slf4j.Slf4j;
 public class FeedbackAnswerServiceImpl extends AbstractCRUDServiceImpl<FeedbackAnswerDao, FeedbackAnswerEntity, Long> implements FeedbackAnswerService {
     @Autowired
     private FeedbackAnswerOptionService feedbackAnswerOptionService;
+    @Autowired
+    private FeedbackQuestionService feedbackQuestionService;
     
     @Override
     protected void saveAfter(FeedbackAnswerEntity entity, Context context) throws AppException {
@@ -64,4 +70,17 @@ public class FeedbackAnswerServiceImpl extends AbstractCRUDServiceImpl<FeedbackA
         feedbackAnswerOptionService.removeList(feedbackAnswerOptionlist,context);
         super.removeAfter(ids, context, result);
     }
+
+    @Override
+    protected void findAfter(FeedbackAnswerEntity params, PageInfo pageInfo, Context context, List<FeedbackAnswerEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for(FeedbackAnswerEntity item:list){
+                FeedbackQuestionEntity questionEntity = feedbackQuestionService.get(item.getQuestionId());
+                if(questionEntity!=null){
+                    item.setQuestionContent(questionEntity.getContent());
+                }
+            }
+        }
+        super.findAfter(params, pageInfo, context, list);
+    }
 }
\ No newline at end of file

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

@@ -35,8 +35,8 @@ public class FeedbackQuestionServiceImpl extends AbstractCRUDServiceImpl<Feedbac
                 item.setQuestionId(entity.getId());
                 item.setCreateUserId(this.getContextUserId(context));
                 item.setCreateTime(new Date());
-                feedbackOptionService.save(item);
             }).count();
+            feedbackOptionService.save(entity.getFeedbackOptionList());
         }
         super.saveAfter(entity, context);
     }

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

@@ -52,7 +52,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
                 item.setCreateUserId(this.getContextUserId(context));
                 item.setCreateTime(new Date());
             }).count();
-            feedbackQuestionService.save(entity.getFeedbackQuestionList());
+            for(FeedbackQuestionEntity questionEntity:entity.getFeedbackQuestionList()) {
+                feedbackQuestionService.save(questionEntity);
+            }
         }
         if(!ObjectUtils.isEmpty(entity.getStaffList())){
             List<FeedbackStaffEntity> staffEntityList = new ArrayList<>();
@@ -81,7 +83,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
                 item.setUpdateUserId(this.getContextUserId(context));
                 item.setUpdateTime(new Date());
             }).count();
-            feedbackQuestionService.save(entity.getFeedbackQuestionList());
+            for(FeedbackQuestionEntity questionEntity:entity.getFeedbackQuestionList()) {
+                feedbackQuestionService.save(questionEntity);
+            }
         }
         if(!ObjectUtils.isEmpty(entity.getStaffList())){
             Long[] feedbackStaffIds = feedbackStaffService.find(new FeedbackStaffQuery().feedbackId(entity.getId())).stream().map(FeedbackStaffEntity::getId).toArray(Long[]::new);
@@ -110,11 +114,14 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     }
 
     @Override
-    public List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) throws AppException {
-        if(feedbackId==null){
+    public Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) throws AppException {
+        if(query.getFeedbackId()==null){
             throw new AppException("绩效反馈记录Id不能为空");
         }
-        return dao.getFeedbackStaffList(feedbackId);
+        if(pageInfo==null){
+            pageInfo = new PageInfo();
+        }
+        return dao.getFeedbackStaffList(query,pageInfo);
     }
 
     @Override

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

 package com.mortals.xhx.module.feedback.web;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.module.feedback.model.FeedbackAnswerEntity;
+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.FeedbackOptionService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -19,16 +21,13 @@ import com.mortals.framework.model.Context;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -46,6 +45,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private FeedbackOptionService feedbackOptionService;
+
     public FeedbackController(){
         super.setModuleDesc( "绩效反馈记录信息");
     }
@@ -61,14 +63,25 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         super.init(model, context);
     }
 
+    @Override
+    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())){
+            for(FeedbackQuestionEntity item:entity.getFeedbackQuestionList()){
+                List<FeedbackOptionEntity> optionEntities = feedbackOptionService.find(new FeedbackOptionQuery().questionId(item.getId()));
+                item.setFeedbackOptionList(optionEntities);
+            }
+        }
+        return super.infoAfter(id, model, entity, context);
+    }
+
     /**
      * 查询问卷反馈人员列表
-     * @param feedbackId
+     * @param query
      * @return
      */
-    @RequestMapping(value = {"getStaffList"},method = {RequestMethod.POST, RequestMethod.GET})
+    @PostMapping({"getStaffList"})
     @UnAuth
-    public Rest<Object> getFeedbackStaffList(Long feedbackId) {
+    public Rest<Object> getFeedbackStaffList(@RequestBody FeedbackEntity query) {
         Rest<Object> ret = new Rest();
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();
@@ -76,9 +89,10 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
 
         int code=1;
         try {
-            List<FeedbackStaffInfoVo> result = this.getService().getFeedbackStaffList(feedbackId);
-            if(CollectionUtils.isNotEmpty(result)) {
-                Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
+            PageInfo pageInfo = this.buildPageInfo(query);
+            Result<FeedbackStaffInfoVo> result = this.getService().getFeedbackStaffList(query,pageInfo);
+            if(CollectionUtils.isNotEmpty(result.getList())) {
+                Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.getList().stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
                 if(groupMap.containsKey(1)) {
                     model.put("feedBack", groupMap.get(1).size());
                 }else {
@@ -93,8 +107,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
                 model.put("feedBack", 0);
                 model.put("notBack", 0);
             }
-            model.put("data", result);
-            model.put("message_info", busiDesc + "成功");
+            model.put("data", result.getList());
+            model.put("pageInfo", result.getPageInfo());
+            this.parsePageInfo(model, result.getPageInfo());
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 this.recordSysLog(this.request, busiDesc + " 【成功】");
             }
@@ -126,7 +141,21 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         int code=1;
         try {
             List<OptionSummaryVo> result = this.getService().getOptionSummaryList(feedbackId);
-            model.put("data", result);
+            List<OptionSummaryVo> list = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(result)) {
+                Map<Long, List<OptionSummaryVo>> groupMap = result.stream().collect(Collectors.groupingBy(OptionSummaryVo::getQuestionId));
+                for (Long key : groupMap.keySet()) {
+                    OptionSummaryVo vo = new OptionSummaryVo();
+                    OptionSummaryVo temp = groupMap.get(key).get(0);
+                    vo.setQuestionId(key);
+                    vo.setQuestion(temp.getQuestion());
+                    vo.setFeedbackId(temp.getFeedbackId());
+                    vo.setQuestionType(temp.getQuestionType());
+                    vo.setOptionList(groupMap.get(key));
+                    list.add(vo);
+                }
+            }
+            model.put("data", list);
             model.put("message_info", busiDesc + "成功");
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 this.recordSysLog(this.request, busiDesc + " 【成功】");
@@ -156,14 +185,13 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         Context context = this.getContext();
         String busiDesc = "查询问卷问题反馈详情";
 
-        int code=1;
+        int code = 1;
         try {
             PageInfo pageInfo = this.buildPageInfo(query);
             Result<QuestionAnswerVo> result = this.getService().getQuestionAnswerList(query.getQuestionId(), pageInfo);
             model.put("data", result.getList());
             model.put("pageInfo", result.getPageInfo());
             this.parsePageInfo(model, result.getPageInfo());
-            code = this.doListAfter(query, (Map)model, context);
             model.put("message_info", busiDesc + "成功");
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 this.recordSysLog(this.request, busiDesc + " 【成功】");

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
+
 import com.mortals.xhx.common.code.CheckStatusEnum;
 import com.mortals.xhx.common.code.SubMethodEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
@@ -18,12 +19,12 @@ import lombok.extern.slf4j.Slf4j;
 import java.util.Date;
 
 /**
-* PerformAttendRecordService
-* 考勤绩效记录信息 service实现
-*
-* @author zxfei
-* @date 2023-07-10
-*/
+ * PerformAttendRecordService
+ * 考勤绩效记录信息 service实现
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
 @Service("performAttendRecordService")
 @Slf4j
 public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<PerformAttendRecordDao, PerformAttendRecordEntity, Long> implements PerformAttendRecordService {
@@ -35,28 +36,29 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
     protected void saveAfter(PerformAttendRecordEntity entity, Context context) throws AppException {
         CheckAttendRecordEntity checkAttendRecordEntity = new CheckAttendRecordEntity();
         checkAttendRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
+        BeanUtils.copyProperties(entity, checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkAttendRecordEntity.setId(null);
         checkAttendRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
+        if (entity.getSubMethod() == SubMethodEnum.系统自动.getValue()) {
             checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
+        } else {
             checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkAttendRecordService.save(checkAttendRecordEntity,context);
+        checkAttendRecordEntity.setCheckTime(new Date());
+        checkAttendRecordService.save(checkAttendRecordEntity, context);
     }
 
     @Override
     public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
+        if (id == null) {
             throw new AppException("考勤绩效记录Id不能为空");
         }
         PerformAttendRecordEntity entity = this.get(id);
-        if(entity==null){
+        if (entity == null) {
             throw new AppException("无效的考勤绩效记录Id");
         }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
+        if (status == null) {
+            status = 1; //处理状态(1.未核查,2.已核查)
         }
         PerformAttendRecordEntity update = new PerformAttendRecordEntity();
         update.setId(id);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java

@@ -43,6 +43,7 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
         }else {
             checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
+        checkComplainRecordEntity.setCheckTime(new Date());
         checkComplainRecordService.save(checkComplainRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java

@@ -43,6 +43,7 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         }else {
             checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
+        checkEffectRecordEntity.setCheckTime(new Date());
         checkEffectRecordService.save(checkEffectRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java

@@ -43,6 +43,7 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         }else {
             checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
+        checkGoworkRecordEntity.setCheckTime(new Date());
         checkGoworkRecordService.save(checkGoworkRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java

@@ -43,6 +43,7 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
         }else {
             checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
+        checkOtherRecordEntity.setCheckTime(new Date());
         checkOtherRecordService.save(checkOtherRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java

@@ -42,6 +42,9 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         }else {
             checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
+
+        //checkReviewRecordEntity.s
+
         checkReviewRecordService.save(checkReviewRecordEntity,context);
     }
 

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

@@ -2,12 +2,14 @@ package com.mortals.xhx.module.perform.web;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.EnabledEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,16 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
+
+    @Override
+    protected void doListBefore(PerformAttendAppealEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 申诉统计
      */

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -42,11 +46,22 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendRecord","subMethod"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendRecord","subAddType"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendRecord","processStatus"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
+import org.apache.tomcat.jni.Proc;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -42,9 +44,12 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformComplainRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformComplainRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformComplainRecord","subAddType"));
+       this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -43,11 +47,21 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformEffectRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformEffectRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformEffectRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -42,11 +46,22 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformGoworkRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformGoworkRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformGoworkRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -43,11 +47,22 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformOtherRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformOtherRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformOtherRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -44,11 +48,21 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformReviewRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformReviewRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformReviewRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java

 package com.mortals.xhx.module.staff.model;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
 import lombok.Data;
+
 /**
-* 员工绩效统计实体对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 员工绩效统计实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
     private static final long serialVersionUID = 1L;
@@ -20,28 +25,26 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     /**
      * 部门id号
      */
-    private Long deptId;
+    private Long staffId;
     /**
      * 部门名称
      */
-    private String deptName;
+    private String staffName;
     /**
      * 员工绩效总分数
      */
     @Excel(name = "员工绩效总分数")
     private BigDecimal totalScore;
     /**
-    * 备注
-    */
-    private String remark;
-    /**
-    * 年
+     * 员工绩效加分总分数汇总
      */
-    private Integer year;
+    @Excel(name = "员工绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
     /**
-    * 月
+     * 员工绩效减分总分数汇总
      */
-    private Integer month;
+    @Excel(name = "员工绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
     /**
      * 考勤绩效指标增加分数
      */
@@ -58,6 +61,14 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
      * 评价绩效指标扣减分数
      */
     private BigDecimal assessScoreSub;
+    /**
+     * 投诉绩效指标增加分数
+     */
+    private BigDecimal complainScoreAdd;
+    /**
+     * 投诉绩效指标扣减分数
+     */
+    private BigDecimal complainScoreSub;
     /**
      * 办件绩效指标增加分数
      */
@@ -83,31 +94,27 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
      */
     private BigDecimal otherScoreSub;
     /**
-    * 日
-    */
-    private Integer day;
-    /**
-    * 员工绩效加分总分数汇总
+     * 备注
      */
-    @Excel(name = "员工绩效加分总分数汇总")
-    private BigDecimal totalAddScore;
+    private String remark;
     /**
-    * 员工绩效减分总分数汇总
+     * 年
      */
-    @Excel(name = "员工绩效减分总分数汇总")
-    private BigDecimal totalSubScore;
+    private Integer year;
     /**
-    * 投诉绩效指标增加分数
+     * 月
      */
-    private BigDecimal complainScoreAdd;
+    private Integer month;
     /**
-    * 投诉绩效指标扣减分数
+     * 日
      */
-    private BigDecimal complainScoreSub;
+    private Integer day;
+
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -120,19 +127,17 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
         return false;
     }
 
-    public void initAttrValue(){
+    public void initAttrValue() {
 
-            this.deptId = 0L;
+        this.staffId = 0L;
 
-            this.deptName = "";
+        this.staffName = "";
 
         this.totalScore = new BigDecimal(0);
 
-            this.remark = "";
-
-            this.year = -1;
+        this.totalAddScore = new BigDecimal(0);
 
-            this.month = -1;
+        this.totalSubScore = new BigDecimal(0);
 
         this.attendScoreAdd = new BigDecimal(0);
 
@@ -142,6 +147,10 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
         this.assessScoreSub = new BigDecimal(0);
 
+        this.complainScoreAdd = new BigDecimal(0);
+
+        this.complainScoreSub = new BigDecimal(0);
+
         this.workScoreAdd = new BigDecimal(0);
 
         this.workScoreSub = new BigDecimal(0);
@@ -154,14 +163,12 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
         this.otherScoreSub = new BigDecimal(0);
 
-            this.day = -1;
-
-            this.totalAddScore = new BigDecimal(0);
+        this.remark = "";
 
-            this.totalSubScore = new BigDecimal(0);
+        this.year = DateUtil.year(new Date());
 
-            this.complainScoreAdd = new BigDecimal(0);
+        this.month = DateUtil.month(new Date()) + 1;
 
-            this.complainScoreSub = new BigDecimal(0);
+        this.day = DateUtil.dayOfMonth(new Date());
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatQuery.java

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 /**
-* 员工绩效统计查询对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 员工绩效统计查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
 public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -26,25 +26,25 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     private List <Long> idNotList;
 
     /** 开始 部门id号 */
-    private Long deptIdStart;
+    private Long staffIdStart;
 
     /** 结束 部门id号 */
-    private Long deptIdEnd;
+    private Long staffIdEnd;
 
     /** 增加 部门id号 */
-    private Long deptIdIncrement;
+    private Long staffIdIncrement;
 
     /** 部门id号列表 */
-    private List <Long> deptIdList;
+    private List <Long> staffIdList;
 
     /** 部门id号排除列表 */
-    private List <Long> deptIdNotList;
+    private List <Long> staffIdNotList;
 
     /** 部门名称 */
-    private List<String> deptNameList;
+    private List<String> staffNameList;
 
     /** 部门名称排除列表 */
-    private List <String> deptNameNotList;
+    private List <String> staffNameNotList;
     /** 开始 员工绩效总分数 */
     private BigDecimal totalScoreStart;
 
@@ -60,82 +60,35 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 员工绩效总分数排除列表 */
     private List <BigDecimal> totalScoreNotList;
 
-    /** 备注 */
-    private List<String> remarkList;
-
-    /** 备注排除列表 */
-    private List <String> remarkNotList;
-    /** 开始 年 */
-    private Integer yearStart;
-
-    /** 结束 年 */
-    private Integer yearEnd;
-
-    /** 增加 年 */
-    private Integer yearIncrement;
-
-    /** 年列表 */
-    private List <Integer> yearList;
-
-    /** 年排除列表 */
-    private List <Integer> yearNotList;
-
-    /** 开始 月 */
-    private Integer monthStart;
-
-    /** 结束 月 */
-    private Integer monthEnd;
-
-    /** 增加 月 */
-    private Integer monthIncrement;
-
-    /** 月列表 */
-    private List <Integer> monthList;
-
-    /** 月排除列表 */
-    private List <Integer> monthNotList;
-
-    /** 开始 创建时间 */
-    private String createTimeStart;
-
-    /** 结束 创建时间 */
-    private String createTimeEnd;
-
-    /** 开始 创建人id */
-    private Long createUserIdStart;
-
-    /** 结束 创建人id */
-    private Long createUserIdEnd;
-
-    /** 增加 创建人id */
-    private Long createUserIdIncrement;
+    /** 开始 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreStart;
 
-    /** 创建人id列表 */
-    private List <Long> createUserIdList;
+    /** 结束 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreEnd;
 
-    /** 创建人id排除列表 */
-    private List <Long> createUserIdNotList;
+    /** 增加 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreIncrement;
 
-    /** 开始 更新时间 */
-    private String updateTimeStart;
+    /** 员工绩效加分总分数汇总列表 */
+    private List <BigDecimal> totalAddScoreList;
 
-    /** 结束 更新时间 */
-    private String updateTimeEnd;
+    /** 员工绩效加分总分数汇总排除列表 */
+    private List <BigDecimal> totalAddScoreNotList;
 
-    /** 开始 更新人id */
-    private Long updateUserIdStart;
+    /** 开始 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreStart;
 
-    /** 结束 更新人id */
-    private Long updateUserIdEnd;
+    /** 结束 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreEnd;
 
-    /** 增加 更新人id */
-    private Long updateUserIdIncrement;
+    /** 增加 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreIncrement;
 
-    /** 更新人id列表 */
-    private List <Long> updateUserIdList;
+    /** 员工绩效减分总分数汇总列表 */
+    private List <BigDecimal> totalSubScoreList;
 
-    /** 更新人id排除列表 */
-    private List <Long> updateUserIdNotList;
+    /** 员工绩效减分总分数汇总排除列表 */
+    private List <BigDecimal> totalSubScoreNotList;
 
     /** 开始 考勤绩效指标增加分数 */
     private BigDecimal attendScoreAddStart;
@@ -197,6 +150,36 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 评价绩效指标扣减分数排除列表 */
     private List <BigDecimal> assessScoreSubNotList;
 
+    /** 开始 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddStart;
+
+    /** 结束 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddEnd;
+
+    /** 增加 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddIncrement;
+
+    /** 投诉绩效指标增加分数列表 */
+    private List <BigDecimal> complainScoreAddList;
+
+    /** 投诉绩效指标增加分数排除列表 */
+    private List <BigDecimal> complainScoreAddNotList;
+
+    /** 开始 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubStart;
+
+    /** 结束 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubEnd;
+
+    /** 增加 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubIncrement;
+
+    /** 投诉绩效指标扣减分数列表 */
+    private List <BigDecimal> complainScoreSubList;
+
+    /** 投诉绩效指标扣减分数排除列表 */
+    private List <BigDecimal> complainScoreSubNotList;
+
     /** 开始 办件绩效指标增加分数 */
     private BigDecimal workScoreAddStart;
 
@@ -287,6 +270,41 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 其它绩效指标扣减分数排除列表 */
     private List <BigDecimal> otherScoreSubNotList;
 
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 年 */
+    private Integer yearStart;
+
+    /** 结束 年 */
+    private Integer yearEnd;
+
+    /** 增加 年 */
+    private Integer yearIncrement;
+
+    /** 年列表 */
+    private List <Integer> yearList;
+
+    /** 年排除列表 */
+    private List <Integer> yearNotList;
+
+    /** 开始 月 */
+    private Integer monthStart;
+
+    /** 结束 月 */
+    private Integer monthEnd;
+
+    /** 增加 月 */
+    private Integer monthIncrement;
+
+    /** 月列表 */
+    private List <Integer> monthList;
+
+    /** 月排除列表 */
+    private List <Integer> monthNotList;
+
     /** 开始 日 */
     private Integer dayStart;
 
@@ -302,65 +320,47 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 日排除列表 */
     private List <Integer> dayNotList;
 
-    /** 开始 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreStart;
-
-    /** 结束 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreEnd;
-
-    /** 增加 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreIncrement;
-
-    /** 员工绩效加分总分数汇总列表 */
-    private List <BigDecimal> totalAddScoreList;
-
-    /** 员工绩效加分总分数汇总排除列表 */
-    private List <BigDecimal> totalAddScoreNotList;
-
-    /** 开始 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreStart;
-
-    /** 结束 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreEnd;
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
-    /** 增加 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreIncrement;
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 
-    /** 员工绩效减分总分数汇总列表 */
-    private List <BigDecimal> totalSubScoreList;
+    /** 开始 创建人id */
+    private Long createUserIdStart;
 
-    /** 员工绩效减分总分数汇总排除列表 */
-    private List <BigDecimal> totalSubScoreNotList;
+    /** 结束 创建人id */
+    private Long createUserIdEnd;
 
-    /** 开始 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddStart;
+    /** 增加 创建人id */
+    private Long createUserIdIncrement;
 
-    /** 结束 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddEnd;
+    /** 创建人id列表 */
+    private List <Long> createUserIdList;
 
-    /** 增加 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddIncrement;
+    /** 创建人id排除列表 */
+    private List <Long> createUserIdNotList;
 
-    /** 投诉绩效指标增加分数列表 */
-    private List <BigDecimal> complainScoreAddList;
+    /** 开始 更新时间 */
+    private String updateTimeStart;
 
-    /** 投诉绩效指标增加分数排除列表 */
-    private List <BigDecimal> complainScoreAddNotList;
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
 
-    /** 开始 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubStart;
+    /** 开始 更新人id */
+    private Long updateUserIdStart;
 
-    /** 结束 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubEnd;
+    /** 结束 更新人id */
+    private Long updateUserIdEnd;
 
-    /** 增加 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubIncrement;
+    /** 增加 更新人id */
+    private Long updateUserIdIncrement;
 
-    /** 投诉绩效指标扣减分数列表 */
-    private List <BigDecimal> complainScoreSubList;
+    /** 更新人id列表 */
+    private List <Long> updateUserIdList;
 
-    /** 投诉绩效指标扣减分数排除列表 */
-    private List <BigDecimal> complainScoreSubNotList;
+    /** 更新人id排除列表 */
+    private List <Long> updateUserIdNotList;
 
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffPerformStatQuery> orConditionList;
@@ -453,115 +453,115 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
      * 获取 开始 部门id号
-    * @return deptIdStart
+     * @return staffIdStart
      */
-    public Long getDeptIdStart(){
-        return this.deptIdStart;
+    public Long getStaffIdStart(){
+        return this.staffIdStart;
     }
 
     /**
      * 设置 开始 部门id号
-    * @param deptIdStart
+     * @param staffIdStart
      */
-    public void setDeptIdStart(Long deptIdStart){
-        this.deptIdStart = deptIdStart;
+    public void setStaffIdStart(Long staffIdStart){
+        this.staffIdStart = staffIdStart;
     }
 
     /**
      * 获取 结束 部门id号
-    * @return $deptIdEnd
+     * @return $staffIdEnd
      */
-    public Long getDeptIdEnd(){
-        return this.deptIdEnd;
+    public Long getStaffIdEnd(){
+        return this.staffIdEnd;
     }
 
     /**
      * 设置 结束 部门id号
-    * @param deptIdEnd
+     * @param staffIdEnd
      */
-    public void setDeptIdEnd(Long deptIdEnd){
-        this.deptIdEnd = deptIdEnd;
+    public void setStaffIdEnd(Long staffIdEnd){
+        this.staffIdEnd = staffIdEnd;
     }
 
     /**
      * 获取 增加 部门id号
-    * @return deptIdIncrement
+     * @return staffIdIncrement
      */
-    public Long getDeptIdIncrement(){
-        return this.deptIdIncrement;
+    public Long getStaffIdIncrement(){
+        return this.staffIdIncrement;
     }
 
     /**
      * 设置 增加 部门id号
-    * @param deptIdIncrement
+     * @param staffIdIncrement
      */
-    public void setDeptIdIncrement(Long deptIdIncrement){
-        this.deptIdIncrement = deptIdIncrement;
+    public void setStaffIdIncrement(Long staffIdIncrement){
+        this.staffIdIncrement = staffIdIncrement;
     }
 
     /**
      * 获取 部门id号
-    * @return deptIdList
+     * @return staffIdList
      */
-    public List<Long> getDeptIdList(){
-        return this.deptIdList;
+    public List<Long> getStaffIdList(){
+        return this.staffIdList;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdList
+     * @param staffIdList
      */
-    public void setDeptIdList(List<Long> deptIdList){
-        this.deptIdList = deptIdList;
+    public void setStaffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
     }
 
     /**
      * 获取 部门id号
-    * @return deptIdNotList
+     * @return staffIdNotList
      */
-    public List<Long> getDeptIdNotList(){
-        return this.deptIdNotList;
+    public List<Long> getStaffIdNotList(){
+        return this.staffIdNotList;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdNotList
+     * @param staffIdNotList
      */
-    public void setDeptIdNotList(List<Long> deptIdNotList){
-        this.deptIdNotList = deptIdNotList;
+    public void setStaffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
     }
 
 
     /**
      * 获取 部门名称
-    * @return deptNameList
+     * @return staffNameList
      */
-    public List<String> getDeptNameList(){
-        return this.deptNameList;
+    public List<String> getStaffNameList(){
+        return this.staffNameList;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameList
+     * @param staffNameList
      */
-    public void setDeptNameList(List<String> deptNameList){
-        this.deptNameList = deptNameList;
+    public void setStaffNameList(List<String> staffNameList){
+        this.staffNameList = staffNameList;
     }
 
     /**
      * 获取 部门名称
-    * @return deptNameNotList
+     * @return staffNameNotList
      */
-    public List<String> getDeptNameNotList(){
-        return this.deptNameNotList;
+    public List<String> getStaffNameNotList(){
+        return this.staffNameNotList;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameNotList
+     * @param staffNameNotList
      */
-    public void setDeptNameNotList(List<String> deptNameNotList){
-        this.deptNameNotList = deptNameNotList;
+    public void setStaffNameNotList(List<String> staffNameNotList){
+        this.staffNameNotList = staffNameNotList;
     }
 
     /**
@@ -646,422 +646,164 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
 
     /**
-    * 获取 备注
-    * @return remarkList
+     * 获取 开始 员工绩效加分总分数汇总
+     * @return totalAddScoreStart
      */
-    public List<String> getRemarkList(){
-        return this.remarkList;
+    public BigDecimal getTotalAddScoreStart(){
+        return this.totalAddScoreStart;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
+     * 设置 开始 员工绩效加分总分数汇总
+     * @param totalAddScoreStart
      */
-    public void setRemarkList(List<String> remarkList){
-        this.remarkList = remarkList;
+    public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
+        this.totalAddScoreStart = totalAddScoreStart;
     }
 
     /**
-    * 获取 备注
-    * @return remarkNotList
+     * 获取 结束 员工绩效加分总分数汇总
+     * @return $totalAddScoreEnd
      */
-    public List<String> getRemarkNotList(){
-        return this.remarkNotList;
+    public BigDecimal getTotalAddScoreEnd(){
+        return this.totalAddScoreEnd;
     }
 
     /**
-    * 设置 备注
-    * @param remarkNotList
+     * 设置 结束 员工绩效加分总分数汇总
+     * @param totalAddScoreEnd
      */
-    public void setRemarkNotList(List<String> remarkNotList){
-        this.remarkNotList = remarkNotList;
-    }
-
-    /**
-    * 获取 开始 年
-    * @return yearStart
-    */
-    public Integer getYearStart(){
-        return this.yearStart;
-    }
-
-    /**
-    * 设置 开始 年
-    * @param yearStart
-    */
-    public void setYearStart(Integer yearStart){
-        this.yearStart = yearStart;
-    }
-
-    /**
-    * 获取 结束 年
-    * @return $yearEnd
-    */
-    public Integer getYearEnd(){
-        return this.yearEnd;
-    }
-
-    /**
-    * 设置 结束 年
-    * @param yearEnd
-    */
-    public void setYearEnd(Integer yearEnd){
-        this.yearEnd = yearEnd;
-    }
-
-    /**
-    * 获取 增加 年
-    * @return yearIncrement
-    */
-    public Integer getYearIncrement(){
-        return this.yearIncrement;
-    }
-
-    /**
-    * 设置 增加 年
-    * @param yearIncrement
-    */
-    public void setYearIncrement(Integer yearIncrement){
-        this.yearIncrement = yearIncrement;
-    }
-
-    /**
-    * 获取 年
-    * @return yearList
-    */
-    public List<Integer> getYearList(){
-        return this.yearList;
-    }
-
-    /**
-    * 设置 年
-    * @param yearList
-    */
-    public void setYearList(List<Integer> yearList){
-        this.yearList = yearList;
-    }
-
-    /**
-    * 获取 年
-    * @return yearNotList
-    */
-    public List<Integer> getYearNotList(){
-        return this.yearNotList;
-    }
-
-    /**
-    * 设置 年
-    * @param yearNotList
-    */
-    public void setYearNotList(List<Integer> yearNotList){
-        this.yearNotList = yearNotList;
-    }
-
-
-    /**
-    * 获取 开始 月
-    * @return monthStart
-    */
-    public Integer getMonthStart(){
-        return this.monthStart;
-    }
-
-    /**
-    * 设置 开始 月
-    * @param monthStart
-    */
-    public void setMonthStart(Integer monthStart){
-        this.monthStart = monthStart;
-    }
-
-    /**
-    * 获取 结束 月
-    * @return $monthEnd
-    */
-    public Integer getMonthEnd(){
-        return this.monthEnd;
-    }
-
-    /**
-    * 设置 结束 月
-    * @param monthEnd
-    */
-    public void setMonthEnd(Integer monthEnd){
-        this.monthEnd = monthEnd;
-    }
-
-    /**
-    * 获取 增加 月
-    * @return monthIncrement
-    */
-    public Integer getMonthIncrement(){
-        return this.monthIncrement;
-    }
-
-    /**
-    * 设置 增加 月
-    * @param monthIncrement
-    */
-    public void setMonthIncrement(Integer monthIncrement){
-        this.monthIncrement = monthIncrement;
-    }
-
-    /**
-    * 获取 月
-    * @return monthList
-    */
-    public List<Integer> getMonthList(){
-        return this.monthList;
-    }
-
-    /**
-    * 设置 月
-    * @param monthList
-    */
-    public void setMonthList(List<Integer> monthList){
-        this.monthList = monthList;
-    }
-
-    /**
-    * 获取 月
-    * @return monthNotList
-    */
-    public List<Integer> getMonthNotList(){
-        return this.monthNotList;
-    }
-
-    /**
-    * 设置 月
-    * @param monthNotList
-    */
-    public void setMonthNotList(List<Integer> monthNotList){
-        this.monthNotList = monthNotList;
-    }
-
-
-    /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
-    }
-
-    /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
-    }
-
-    /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
-    }
-
-    /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
-    }
-
-    /**
-    * 获取 开始 创建人id
-    * @return createUserIdStart
-    */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
-    }
-
-    /**
-    * 设置 开始 创建人id
-    * @param createUserIdStart
-    */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-    }
-
-    /**
-    * 获取 结束 创建人id
-    * @return $createUserIdEnd
-    */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
-    }
-
-    /**
-    * 设置 结束 创建人id
-    * @param createUserIdEnd
-    */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-    }
-
-    /**
-    * 获取 增加 创建人id
-    * @return createUserIdIncrement
-    */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
-    }
-
-    /**
-    * 设置 增加 创建人id
-    * @param createUserIdIncrement
-    */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-    }
-
-    /**
-    * 获取 创建人id
-    * @return createUserIdList
-    */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
-    }
-
-    /**
-    * 设置 创建人id
-    * @param createUserIdList
-    */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+    public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
+        this.totalAddScoreEnd = totalAddScoreEnd;
     }
 
     /**
-    * 获取 创建人id
-    * @return createUserIdNotList
+     * 获取 增加 员工绩效加分总分数汇总
+     * @return totalAddScoreIncrement
      */
-    public List<Long> getCreateUserIdNotList(){
-        return this.createUserIdNotList;
+    public BigDecimal getTotalAddScoreIncrement(){
+        return this.totalAddScoreIncrement;
     }
 
     /**
-    * 设置 创建人id
-    * @param createUserIdNotList
+     * 设置 增加 员工绩效加分总分数汇总
+     * @param totalAddScoreIncrement
      */
-    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
-        this.createUserIdNotList = createUserIdNotList;
+    public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+        this.totalAddScoreIncrement = totalAddScoreIncrement;
     }
 
-
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
+     * 获取 员工绩效加分总分数汇总
+     * @return totalAddScoreList
      */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
+    public List<BigDecimal> getTotalAddScoreList(){
+        return this.totalAddScoreList;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreList
      */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
+    public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
+        this.totalAddScoreList = totalAddScoreList;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
+     * 获取 员工绩效加分总分数汇总
+     * @return totalAddScoreNotList
      */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
+    public List<BigDecimal> getTotalAddScoreNotList(){
+        return this.totalAddScoreNotList;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreNotList
      */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
+    public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+        this.totalAddScoreNotList = totalAddScoreNotList;
     }
 
+
     /**
-    * 获取 开始 更新人id
-    * @return updateUserIdStart
+     * 获取 开始 员工绩效减分总分数汇总
+     * @return totalSubScoreStart
      */
-    public Long getUpdateUserIdStart(){
-        return this.updateUserIdStart;
+    public BigDecimal getTotalSubScoreStart(){
+        return this.totalSubScoreStart;
     }
 
     /**
-    * 设置 开始 更新人id
-    * @param updateUserIdStart
+     * 设置 开始 员工绩效减分总分数汇总
+     * @param totalSubScoreStart
      */
-    public void setUpdateUserIdStart(Long updateUserIdStart){
-        this.updateUserIdStart = updateUserIdStart;
+    public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
+        this.totalSubScoreStart = totalSubScoreStart;
     }
 
     /**
-    * 获取 结束 更新人id
-    * @return $updateUserIdEnd
+     * 获取 结束 员工绩效减分总分数汇总
+     * @return $totalSubScoreEnd
      */
-    public Long getUpdateUserIdEnd(){
-        return this.updateUserIdEnd;
+    public BigDecimal getTotalSubScoreEnd(){
+        return this.totalSubScoreEnd;
     }
 
     /**
-    * 设置 结束 更新人id
-    * @param updateUserIdEnd
+     * 设置 结束 员工绩效减分总分数汇总
+     * @param totalSubScoreEnd
      */
-    public void setUpdateUserIdEnd(Long updateUserIdEnd){
-        this.updateUserIdEnd = updateUserIdEnd;
+    public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
+        this.totalSubScoreEnd = totalSubScoreEnd;
     }
 
     /**
-    * 获取 增加 更新人id
-    * @return updateUserIdIncrement
+     * 获取 增加 员工绩效减分总分数汇总
+     * @return totalSubScoreIncrement
      */
-    public Long getUpdateUserIdIncrement(){
-        return this.updateUserIdIncrement;
+    public BigDecimal getTotalSubScoreIncrement(){
+        return this.totalSubScoreIncrement;
     }
 
     /**
-    * 设置 增加 更新人id
-    * @param updateUserIdIncrement
+     * 设置 增加 员工绩效减分总分数汇总
+     * @param totalSubScoreIncrement
      */
-    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
-        this.updateUserIdIncrement = updateUserIdIncrement;
+    public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+        this.totalSubScoreIncrement = totalSubScoreIncrement;
     }
 
     /**
-    * 获取 更新人id
-    * @return updateUserIdList
+     * 获取 员工绩效减分总分数汇总
+     * @return totalSubScoreList
      */
-    public List<Long> getUpdateUserIdList(){
-        return this.updateUserIdList;
+    public List<BigDecimal> getTotalSubScoreList(){
+        return this.totalSubScoreList;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreList
      */
-    public void setUpdateUserIdList(List<Long> updateUserIdList){
-        this.updateUserIdList = updateUserIdList;
+    public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
     }
 
     /**
-    * 获取 更新人id
-    * @return updateUserIdNotList
+     * 获取 员工绩效减分总分数汇总
+     * @return totalSubScoreNotList
      */
-    public List<Long> getUpdateUserIdNotList(){
-        return this.updateUserIdNotList;
+    public List<BigDecimal> getTotalSubScoreNotList(){
+        return this.totalSubScoreNotList;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdNotList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreNotList
      */
-    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
-        this.updateUserIdNotList = updateUserIdNotList;
+    public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
     }
 
 
@@ -1325,67 +1067,229 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     }
 
     /**
-    * 获取 结束 评价绩效指标扣减分数
-    * @return $assessScoreSubEnd
+     * 获取 结束 评价绩效指标扣减分数
+     * @return $assessScoreSubEnd
+     */
+    public BigDecimal getAssessScoreSubEnd(){
+        return this.assessScoreSubEnd;
+    }
+
+    /**
+     * 设置 结束 评价绩效指标扣减分数
+     * @param assessScoreSubEnd
+     */
+    public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
+        this.assessScoreSubEnd = assessScoreSubEnd;
+    }
+
+    /**
+     * 获取 增加 评价绩效指标扣减分数
+     * @return assessScoreSubIncrement
+     */
+    public BigDecimal getAssessScoreSubIncrement(){
+        return this.assessScoreSubIncrement;
+    }
+
+    /**
+     * 设置 增加 评价绩效指标扣减分数
+     * @param assessScoreSubIncrement
+     */
+    public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
+        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    }
+
+    /**
+     * 获取 评价绩效指标扣减分数
+     * @return assessScoreSubList
+     */
+    public List<BigDecimal> getAssessScoreSubList(){
+        return this.assessScoreSubList;
+    }
+
+    /**
+     * 设置 评价绩效指标扣减分数
+     * @param assessScoreSubList
+     */
+    public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
+        this.assessScoreSubList = assessScoreSubList;
+    }
+
+    /**
+     * 获取 评价绩效指标扣减分数
+     * @return assessScoreSubNotList
+     */
+    public List<BigDecimal> getAssessScoreSubNotList(){
+        return this.assessScoreSubNotList;
+    }
+
+    /**
+     * 设置 评价绩效指标扣减分数
+     * @param assessScoreSubNotList
+     */
+    public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
+        this.assessScoreSubNotList = assessScoreSubNotList;
+    }
+
+
+    /**
+     * 获取 开始 投诉绩效指标增加分数
+     * @return complainScoreAddStart
+     */
+    public BigDecimal getComplainScoreAddStart(){
+        return this.complainScoreAddStart;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标增加分数
+     * @param complainScoreAddStart
+     */
+    public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
+        this.complainScoreAddStart = complainScoreAddStart;
+    }
+
+    /**
+     * 获取 结束 投诉绩效指标增加分数
+     * @return $complainScoreAddEnd
+     */
+    public BigDecimal getComplainScoreAddEnd(){
+        return this.complainScoreAddEnd;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标增加分数
+     * @param complainScoreAddEnd
+     */
+    public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
+        this.complainScoreAddEnd = complainScoreAddEnd;
+    }
+
+    /**
+     * 获取 增加 投诉绩效指标增加分数
+     * @return complainScoreAddIncrement
+     */
+    public BigDecimal getComplainScoreAddIncrement(){
+        return this.complainScoreAddIncrement;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标增加分数
+     * @param complainScoreAddIncrement
+     */
+    public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+        this.complainScoreAddIncrement = complainScoreAddIncrement;
+    }
+
+    /**
+     * 获取 投诉绩效指标增加分数
+     * @return complainScoreAddList
+     */
+    public List<BigDecimal> getComplainScoreAddList(){
+        return this.complainScoreAddList;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddList
+     */
+    public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
+        this.complainScoreAddList = complainScoreAddList;
+    }
+
+    /**
+     * 获取 投诉绩效指标增加分数
+     * @return complainScoreAddNotList
+     */
+    public List<BigDecimal> getComplainScoreAddNotList(){
+        return this.complainScoreAddNotList;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddNotList
+     */
+    public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+        this.complainScoreAddNotList = complainScoreAddNotList;
+    }
+
+
+    /**
+     * 获取 开始 投诉绩效指标扣减分数
+     * @return complainScoreSubStart
+     */
+    public BigDecimal getComplainScoreSubStart(){
+        return this.complainScoreSubStart;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标扣减分数
+     * @param complainScoreSubStart
+     */
+    public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
+        this.complainScoreSubStart = complainScoreSubStart;
+    }
+
+    /**
+     * 获取 结束 投诉绩效指标扣减分数
+     * @return $complainScoreSubEnd
      */
-    public BigDecimal getAssessScoreSubEnd(){
-        return this.assessScoreSubEnd;
+    public BigDecimal getComplainScoreSubEnd(){
+        return this.complainScoreSubEnd;
     }
 
     /**
-    * 设置 结束 评价绩效指标扣减分数
-    * @param assessScoreSubEnd
+     * 设置 结束 投诉绩效指标扣减分数
+     * @param complainScoreSubEnd
      */
-    public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
-        this.assessScoreSubEnd = assessScoreSubEnd;
+    public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
+        this.complainScoreSubEnd = complainScoreSubEnd;
     }
 
     /**
-    * 获取 增加 评价绩效指标扣减分数
-    * @return assessScoreSubIncrement
+     * 获取 增加 投诉绩效指标扣减分数
+     * @return complainScoreSubIncrement
      */
-    public BigDecimal getAssessScoreSubIncrement(){
-        return this.assessScoreSubIncrement;
+    public BigDecimal getComplainScoreSubIncrement(){
+        return this.complainScoreSubIncrement;
     }
 
     /**
-    * 设置 增加 评价绩效指标扣减分数
-    * @param assessScoreSubIncrement
+     * 设置 增加 投诉绩效指标扣减分数
+     * @param complainScoreSubIncrement
      */
-    public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
-        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+        this.complainScoreSubIncrement = complainScoreSubIncrement;
     }
 
     /**
-    * 获取 评价绩效指标扣减分数
-    * @return assessScoreSubList
+     * 获取 投诉绩效指标扣减分数
+     * @return complainScoreSubList
      */
-    public List<BigDecimal> getAssessScoreSubList(){
-        return this.assessScoreSubList;
+    public List<BigDecimal> getComplainScoreSubList(){
+        return this.complainScoreSubList;
     }
 
     /**
-    * 设置 评价绩效指标扣减分数
-    * @param assessScoreSubList
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubList
      */
-    public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
-        this.assessScoreSubList = assessScoreSubList;
+    public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
     }
 
     /**
-    * 获取 评价绩效指标扣减分数
-    * @return assessScoreSubNotList
+     * 获取 投诉绩效指标扣减分数
+     * @return complainScoreSubNotList
      */
-    public List<BigDecimal> getAssessScoreSubNotList(){
-        return this.assessScoreSubNotList;
+    public List<BigDecimal> getComplainScoreSubNotList(){
+        return this.complainScoreSubNotList;
     }
 
     /**
-    * 设置 评价绩效指标扣减分数
-    * @param assessScoreSubNotList
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubNotList
      */
-    public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
-        this.assessScoreSubNotList = assessScoreSubNotList;
+    public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
     }
 
 
@@ -1822,56 +1726,250 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * 设置 结束 其它绩效指标扣减分数
      * @param otherScoreSubEnd
      */
-    public void setOtherScoreSubEnd(BigDecimal otherScoreSubEnd){
-        this.otherScoreSubEnd = otherScoreSubEnd;
+    public void setOtherScoreSubEnd(BigDecimal otherScoreSubEnd){
+        this.otherScoreSubEnd = otherScoreSubEnd;
+    }
+
+    /**
+     * 获取 增加 其它绩效指标扣减分数
+     * @return otherScoreSubIncrement
+     */
+    public BigDecimal getOtherScoreSubIncrement(){
+        return this.otherScoreSubIncrement;
+    }
+
+    /**
+     * 设置 增加 其它绩效指标扣减分数
+     * @param otherScoreSubIncrement
+     */
+    public void setOtherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
+        this.otherScoreSubIncrement = otherScoreSubIncrement;
+    }
+
+    /**
+     * 获取 其它绩效指标扣减分数
+     * @return otherScoreSubList
+     */
+    public List<BigDecimal> getOtherScoreSubList(){
+        return this.otherScoreSubList;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubList
+     */
+    public void setOtherScoreSubList(List<BigDecimal> otherScoreSubList){
+        this.otherScoreSubList = otherScoreSubList;
+    }
+
+    /**
+     * 获取 其它绩效指标扣减分数
+     * @return otherScoreSubNotList
+     */
+    public List<BigDecimal> getOtherScoreSubNotList(){
+        return this.otherScoreSubNotList;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubNotList
+     */
+    public void setOtherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
+        this.otherScoreSubNotList = otherScoreSubNotList;
+    }
+
+
+    /**
+     * 获取 备注
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+     * 获取 备注
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+     * 获取 开始 年
+     * @return yearStart
+     */
+    public Integer getYearStart(){
+        return this.yearStart;
+    }
+
+    /**
+     * 设置 开始 年
+     * @param yearStart
+     */
+    public void setYearStart(Integer yearStart){
+        this.yearStart = yearStart;
+    }
+
+    /**
+     * 获取 结束 年
+     * @return $yearEnd
+     */
+    public Integer getYearEnd(){
+        return this.yearEnd;
+    }
+
+    /**
+     * 设置 结束 年
+     * @param yearEnd
+     */
+    public void setYearEnd(Integer yearEnd){
+        this.yearEnd = yearEnd;
+    }
+
+    /**
+     * 获取 增加 年
+     * @return yearIncrement
+     */
+    public Integer getYearIncrement(){
+        return this.yearIncrement;
+    }
+
+    /**
+     * 设置 增加 年
+     * @param yearIncrement
+     */
+    public void setYearIncrement(Integer yearIncrement){
+        this.yearIncrement = yearIncrement;
+    }
+
+    /**
+     * 获取 年
+     * @return yearList
+     */
+    public List<Integer> getYearList(){
+        return this.yearList;
+    }
+
+    /**
+     * 设置 年
+     * @param yearList
+     */
+    public void setYearList(List<Integer> yearList){
+        this.yearList = yearList;
+    }
+
+    /**
+     * 获取 年
+     * @return yearNotList
+     */
+    public List<Integer> getYearNotList(){
+        return this.yearNotList;
+    }
+
+    /**
+     * 设置 年
+     * @param yearNotList
+     */
+    public void setYearNotList(List<Integer> yearNotList){
+        this.yearNotList = yearNotList;
+    }
+
+
+    /**
+     * 获取 开始 月
+     * @return monthStart
+     */
+    public Integer getMonthStart(){
+        return this.monthStart;
+    }
+
+    /**
+     * 设置 开始 月
+     * @param monthStart
+     */
+    public void setMonthStart(Integer monthStart){
+        this.monthStart = monthStart;
+    }
+
+    /**
+     * 获取 结束 月
+     * @return $monthEnd
+     */
+    public Integer getMonthEnd(){
+        return this.monthEnd;
+    }
+
+    /**
+     * 设置 结束 月
+     * @param monthEnd
+     */
+    public void setMonthEnd(Integer monthEnd){
+        this.monthEnd = monthEnd;
     }
 
     /**
-    * 获取 增加 其它绩效指标扣减分数
-    * @return otherScoreSubIncrement
+     * 获取 增加 月
+     * @return monthIncrement
      */
-    public BigDecimal getOtherScoreSubIncrement(){
-        return this.otherScoreSubIncrement;
+    public Integer getMonthIncrement(){
+        return this.monthIncrement;
     }
 
     /**
-    * 设置 增加 其它绩效指标扣减分数
-    * @param otherScoreSubIncrement
+     * 设置 增加 月
+     * @param monthIncrement
      */
-    public void setOtherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
-        this.otherScoreSubIncrement = otherScoreSubIncrement;
+    public void setMonthIncrement(Integer monthIncrement){
+        this.monthIncrement = monthIncrement;
     }
 
     /**
-    * 获取 其它绩效指标扣减分数
-    * @return otherScoreSubList
+     * 获取 月
+     * @return monthList
      */
-    public List<BigDecimal> getOtherScoreSubList(){
-        return this.otherScoreSubList;
+    public List<Integer> getMonthList(){
+        return this.monthList;
     }
 
     /**
-    * 设置 其它绩效指标扣减分数
-    * @param otherScoreSubList
+     * 设置 月
+     * @param monthList
      */
-    public void setOtherScoreSubList(List<BigDecimal> otherScoreSubList){
-        this.otherScoreSubList = otherScoreSubList;
+    public void setMonthList(List<Integer> monthList){
+        this.monthList = monthList;
     }
 
     /**
-    * 获取 其它绩效指标扣减分数
-    * @return otherScoreSubNotList
+     * 获取 月
+     * @return monthNotList
      */
-    public List<BigDecimal> getOtherScoreSubNotList(){
-        return this.otherScoreSubNotList;
+    public List<Integer> getMonthNotList(){
+        return this.monthNotList;
     }
 
     /**
-    * 设置 其它绩效指标扣减分数
-    * @param otherScoreSubNotList
+     * 设置 月
+     * @param monthNotList
      */
-    public void setOtherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
-        this.otherScoreSubNotList = otherScoreSubNotList;
+    public void setMonthNotList(List<Integer> monthNotList){
+        this.monthNotList = monthNotList;
     }
 
 
@@ -1957,326 +2055,228 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
 
     /**
-    * 获取 开始 员工绩效加分总分数汇总
-    * @return totalAddScoreStart
-    */
-    public BigDecimal getTotalAddScoreStart(){
-        return this.totalAddScoreStart;
-    }
-
-    /**
-    * 设置 开始 员工绩效加分总分数汇总
-    * @param totalAddScoreStart
-    */
-    public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
-        this.totalAddScoreStart = totalAddScoreStart;
-    }
-
-    /**
-    * 获取 结束 员工绩效加分总分数汇总
-    * @return $totalAddScoreEnd
-    */
-    public BigDecimal getTotalAddScoreEnd(){
-        return this.totalAddScoreEnd;
-    }
-
-    /**
-    * 设置 结束 员工绩效加分总分数汇总
-    * @param totalAddScoreEnd
-    */
-    public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
-        this.totalAddScoreEnd = totalAddScoreEnd;
-    }
-
-    /**
-    * 获取 增加 员工绩效加分总分数汇总
-    * @return totalAddScoreIncrement
-    */
-    public BigDecimal getTotalAddScoreIncrement(){
-        return this.totalAddScoreIncrement;
-    }
-
-    /**
-    * 设置 增加 员工绩效加分总分数汇总
-    * @param totalAddScoreIncrement
-    */
-    public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
-        this.totalAddScoreIncrement = totalAddScoreIncrement;
-    }
-
-    /**
-    * 获取 员工绩效加分总分数汇总
-    * @return totalAddScoreList
-    */
-    public List<BigDecimal> getTotalAddScoreList(){
-        return this.totalAddScoreList;
-    }
-
-    /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreList
-    */
-    public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
-        this.totalAddScoreList = totalAddScoreList;
-    }
-
-    /**
-    * 获取 员工绩效加分总分数汇总
-    * @return totalAddScoreNotList
-    */
-    public List<BigDecimal> getTotalAddScoreNotList(){
-        return this.totalAddScoreNotList;
-    }
-
-    /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreNotList
-    */
-    public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
-        this.totalAddScoreNotList = totalAddScoreNotList;
-    }
-
-
-    /**
-    * 获取 开始 员工绩效减分总分数汇总
-    * @return totalSubScoreStart
-    */
-    public BigDecimal getTotalSubScoreStart(){
-        return this.totalSubScoreStart;
-    }
-
-    /**
-    * 设置 开始 员工绩效减分总分数汇总
-    * @param totalSubScoreStart
-    */
-    public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
-        this.totalSubScoreStart = totalSubScoreStart;
-    }
-
-    /**
-    * 获取 结束 员工绩效减分总分数汇总
-    * @return $totalSubScoreEnd
-    */
-    public BigDecimal getTotalSubScoreEnd(){
-        return this.totalSubScoreEnd;
-    }
-
-    /**
-    * 设置 结束 员工绩效减分总分数汇总
-    * @param totalSubScoreEnd
+     * 获取 开始 创建时间
+     * @return createTimeStart
      */
-    public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
-        this.totalSubScoreEnd = totalSubScoreEnd;
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
     }
 
     /**
-    * 获取 增加 员工绩效减分总分数汇总
-    * @return totalSubScoreIncrement
+     * 设置 开始 创建时间
+     * @param createTimeStart
      */
-    public BigDecimal getTotalSubScoreIncrement(){
-        return this.totalSubScoreIncrement;
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 设置 增加 员工绩效减分总分数汇总
-    * @param totalSubScoreIncrement
+     * 获取 结束 创建时间
+     * @return createTimeEnd
      */
-    public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
-        this.totalSubScoreIncrement = totalSubScoreIncrement;
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
     }
 
     /**
-    * 获取 员工绩效减分总分数汇总
-    * @return totalSubScoreList
+     * 设置 结束 创建时间
+     * @param createTimeEnd
      */
-    public List<BigDecimal> getTotalSubScoreList(){
-        return this.totalSubScoreList;
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreList
+     * 获取 开始 创建人id
+     * @return createUserIdStart
      */
-    public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
-        this.totalSubScoreList = totalSubScoreList;
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
     }
 
     /**
-    * 获取 员工绩效减分总分数汇总
-    * @return totalSubScoreNotList
+     * 设置 开始 创建人id
+     * @param createUserIdStart
      */
-    public List<BigDecimal> getTotalSubScoreNotList(){
-        return this.totalSubScoreNotList;
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreNotList
+     * 获取 结束 创建人id
+     * @return $createUserIdEnd
      */
-    public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
-        this.totalSubScoreNotList = totalSubScoreNotList;
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
     }
 
-
     /**
-    * 获取 开始 投诉绩效指标增加分数
-    * @return complainScoreAddStart
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
      */
-    public BigDecimal getComplainScoreAddStart(){
-        return this.complainScoreAddStart;
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 设置 开始 投诉绩效指标增加分数
-    * @param complainScoreAddStart
+     * 获取 增加 创建人id
+     * @return createUserIdIncrement
      */
-    public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
-        this.complainScoreAddStart = complainScoreAddStart;
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
     }
 
     /**
-    * 获取 结束 投诉绩效指标增加分数
-    * @return $complainScoreAddEnd
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
      */
-    public BigDecimal getComplainScoreAddEnd(){
-        return this.complainScoreAddEnd;
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 设置 结束 投诉绩效指标增加分数
-    * @param complainScoreAddEnd
+     * 获取 创建人id
+     * @return createUserIdList
      */
-    public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
-        this.complainScoreAddEnd = complainScoreAddEnd;
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
     }
 
     /**
-    * 获取 增加 投诉绩效指标增加分数
-    * @return complainScoreAddIncrement
+     * 设置 创建人id
+     * @param createUserIdList
      */
-    public BigDecimal getComplainScoreAddIncrement(){
-        return this.complainScoreAddIncrement;
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 设置 增加 投诉绩效指标增加分数
-    * @param complainScoreAddIncrement
+     * 获取 创建人id
+     * @return createUserIdNotList
      */
-    public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
-        this.complainScoreAddIncrement = complainScoreAddIncrement;
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
     }
 
     /**
-    * 获取 投诉绩效指标增加分数
-    * @return complainScoreAddList
+     * 设置 创建人id
+     * @param createUserIdNotList
      */
-    public List<BigDecimal> getComplainScoreAddList(){
-        return this.complainScoreAddList;
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
     }
 
+
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddList
+     * 获取 开始 更新时间
+     * @return updateTimeStart
      */
-    public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
-        this.complainScoreAddList = complainScoreAddList;
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
     }
 
     /**
-    * 获取 投诉绩效指标增加分数
-    * @return complainScoreAddNotList
+     * 设置 开始 更新时间
+     * @param updateTimeStart
      */
-    public List<BigDecimal> getComplainScoreAddNotList(){
-        return this.complainScoreAddNotList;
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddNotList
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
      */
-    public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
-        this.complainScoreAddNotList = complainScoreAddNotList;
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
     }
 
+    /**
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
 
     /**
-    * 获取 开始 投诉绩效指标扣减分数
-    * @return complainScoreSubStart
+     * 获取 开始 更新人id
+     * @return updateUserIdStart
      */
-    public BigDecimal getComplainScoreSubStart(){
-        return this.complainScoreSubStart;
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 投诉绩效指标扣减分数
-    * @param complainScoreSubStart
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
      */
-    public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
-        this.complainScoreSubStart = complainScoreSubStart;
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 投诉绩效指标扣减分数
-    * @return $complainScoreSubEnd
+     * 获取 结束 更新人id
+     * @return $updateUserIdEnd
      */
-    public BigDecimal getComplainScoreSubEnd(){
-        return this.complainScoreSubEnd;
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 投诉绩效指标扣减分数
-    * @param complainScoreSubEnd
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
      */
-    public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
-        this.complainScoreSubEnd = complainScoreSubEnd;
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 投诉绩效指标扣减分数
-    * @return complainScoreSubIncrement
+     * 获取 增加 更新人id
+     * @return updateUserIdIncrement
      */
-    public BigDecimal getComplainScoreSubIncrement(){
-        return this.complainScoreSubIncrement;
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 投诉绩效指标扣减分数
-    * @param complainScoreSubIncrement
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
      */
-    public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
-        this.complainScoreSubIncrement = complainScoreSubIncrement;
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 投诉绩效指标扣减分数
-    * @return complainScoreSubList
+     * 获取 更新人id
+     * @return updateUserIdList
      */
-    public List<BigDecimal> getComplainScoreSubList(){
-        return this.complainScoreSubList;
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubList
+     * 设置 更新人id
+     * @param updateUserIdList
      */
-    public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
-        this.complainScoreSubList = complainScoreSubList;
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 投诉绩效指标扣减分数
-    * @return complainScoreSubNotList
+     * 获取 更新人id
+     * @return updateUserIdNotList
      */
-    public List<BigDecimal> getComplainScoreSubNotList(){
-        return this.complainScoreSubNotList;
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubNotList
+     * 设置 更新人id
+     * @param updateUserIdNotList
      */
-    public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
-        this.complainScoreSubNotList = complainScoreSubNotList;
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
@@ -2336,74 +2336,74 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
      * 设置  部门id号
-    * @param deptId
+     * @param staffId
      */
-    public StaffPerformStatQuery deptId(Long deptId){
-	    setDeptId(deptId);
+    public StaffPerformStatQuery staffId(Long staffId){
+        setStaffId(staffId);
         return this;
     }
 
     /**
      * 设置 开始 部门id号
-    * @param deptIdStart
+     * @param staffIdStart
      */
-    public StaffPerformStatQuery deptIdStart(Long deptIdStart){
-		this.deptIdStart = deptIdStart;
+    public StaffPerformStatQuery staffIdStart(Long staffIdStart){
+        this.staffIdStart = staffIdStart;
         return this;
     }
 
     /**
      * 设置 结束 部门id号
-    * @param deptIdEnd
+     * @param staffIdEnd
      */
-    public StaffPerformStatQuery deptIdEnd(Long deptIdEnd){
-		this.deptIdEnd = deptIdEnd;
+    public StaffPerformStatQuery staffIdEnd(Long staffIdEnd){
+        this.staffIdEnd = staffIdEnd;
         return this;
     }
 
     /**
      * 设置 增加 部门id号
-    * @param deptIdIncrement
+     * @param staffIdIncrement
      */
-    public StaffPerformStatQuery deptIdIncrement(Long deptIdIncrement){
-		this.deptIdIncrement = deptIdIncrement;
+    public StaffPerformStatQuery staffIdIncrement(Long staffIdIncrement){
+        this.staffIdIncrement = staffIdIncrement;
         return this;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdList
+     * @param staffIdList
      */
-    public StaffPerformStatQuery deptIdList(List<Long> deptIdList){
-        this.deptIdList = deptIdList;
+    public StaffPerformStatQuery staffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
         return this;
     }
 
     /**
      * 设置 部门id号
-        * @param deptIdNotList
+     * @param staffIdNotList
      */
-        public StaffPerformStatQuery deptIdNotList(List<Long> deptIdNotList){
-        this.deptIdNotList = deptIdNotList;
+    public StaffPerformStatQuery staffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
         return this;
     }
 
 
     /**
      * 设置 部门名称
-    * @param deptName
+     * @param staffName
      */
-    public StaffPerformStatQuery deptName(String deptName){
-        setDeptName(deptName);
+    public StaffPerformStatQuery staffName(String staffName){
+        setStaffName(staffName);
         return this;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameList
+     * @param staffNameList
      */
-    public StaffPerformStatQuery deptNameList(List<String> deptNameList){
-        this.deptNameList = deptNameList;
+    public StaffPerformStatQuery staffNameList(List<String> staffNameList){
+        this.staffNameList = staffNameList;
         return this;
     }
 
@@ -2421,280 +2421,151 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * @param totalScoreStart
      */
     public StaffPerformStatQuery totalScoreStart(BigDecimal totalScoreStart){
-		this.totalScoreStart = totalScoreStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 员工绩效总分数
-    * @param totalScoreEnd
-    */
-    public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
-		this.totalScoreEnd = totalScoreEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 员工绩效总分数
-    * @param totalScoreIncrement
-    */
-    public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
-		this.totalScoreIncrement = totalScoreIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 员工绩效总分数
-    * @param totalScoreList
-    */
-    public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
-        this.totalScoreList = totalScoreList;
-		return this;
-        }
-
-        /**
-        * 设置 员工绩效总分数
-        * @param totalScoreNotList
-        */
-        public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
-        this.totalScoreNotList = totalScoreNotList;
-        return this;
-        }
-
-
-	/**
-    * 设置 备注
-    * @param remark
-    */
-    public StaffPerformStatQuery remark(String remark){
-        setRemark(remark);
-		return this;
-    }
-
-    /**
-    * 设置 备注
-    * @param remarkList
-    */
-    public StaffPerformStatQuery remarkList(List<String> remarkList){
-        this.remarkList = remarkList;
-		return this;
-    }
-
-    /**
-    * 设置  年
-    * @param year
-    */
-    public StaffPerformStatQuery year(Integer year){
-	    setYear(year);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 年
-    * @param yearStart
-    */
-    public StaffPerformStatQuery yearStart(Integer yearStart){
-		this.yearStart = yearStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 年
-    * @param yearEnd
-    */
-    public StaffPerformStatQuery yearEnd(Integer yearEnd){
-		this.yearEnd = yearEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 年
-    * @param yearIncrement
-    */
-    public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
-		this.yearIncrement = yearIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 年
-    * @param yearList
-    */
-    public StaffPerformStatQuery yearList(List<Integer> yearList){
-        this.yearList = yearList;
-		return this;
-        }
-
-        /**
-        * 设置 年
-        * @param yearNotList
-        */
-        public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
-        this.yearNotList = yearNotList;
-        return this;
-        }
-
-    /**
-    * 设置  月
-    * @param month
-    */
-    public StaffPerformStatQuery month(Integer month){
-	    setMonth(month);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 月
-    * @param monthStart
-    */
-    public StaffPerformStatQuery monthStart(Integer monthStart){
-		this.monthStart = monthStart;
+        this.totalScoreStart = totalScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 月
-    * @param monthEnd
+     * 设置 结束 员工绩效总分数
+     * @param totalScoreEnd
      */
-    public StaffPerformStatQuery monthEnd(Integer monthEnd){
-		this.monthEnd = monthEnd;
+    public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
+        this.totalScoreEnd = totalScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 月
-    * @param monthIncrement
+     * 设置 增加 员工绩效总分数
+     * @param totalScoreIncrement
      */
-    public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
-		this.monthIncrement = monthIncrement;
+    public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
+        this.totalScoreIncrement = totalScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 月
-    * @param monthList
+     * 设置 员工绩效总分数
+     * @param totalScoreList
      */
-    public StaffPerformStatQuery monthList(List<Integer> monthList){
-        this.monthList = monthList;
+    public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
+        this.totalScoreList = totalScoreList;
         return this;
     }
 
     /**
-        * 设置 月
-        * @param monthNotList
+     * 设置 员工绩效总分数
+     * @param totalScoreNotList
      */
-        public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
-        this.monthNotList = monthNotList;
+    public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
+        this.totalScoreNotList = totalScoreNotList;
         return this;
     }
 
-
     /**
-    * 设置  创建人id
-    * @param createUserId
+     * 设置  员工绩效加分总分数汇总
+     * @param totalAddScore
      */
-    public StaffPerformStatQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
+    public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
+        setTotalAddScore(totalAddScore);
         return this;
     }
 
     /**
-    * 设置 开始 创建人id
-    * @param createUserIdStart
+     * 设置 开始 员工绩效加分总分数汇总
+     * @param totalAddScoreStart
      */
-    public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
+    public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
+        this.totalAddScoreStart = totalAddScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 创建人id
-    * @param createUserIdEnd
+     * 设置 结束 员工绩效加分总分数汇总
+     * @param totalAddScoreEnd
      */
-    public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
+    public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
+        this.totalAddScoreEnd = totalAddScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 创建人id
-    * @param createUserIdIncrement
+     * 设置 增加 员工绩效加分总分数汇总
+     * @param totalAddScoreIncrement
      */
-    public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
+    public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+        this.totalAddScoreIncrement = totalAddScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 创建人id
-    * @param createUserIdList
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreList
      */
-    public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+    public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
+        this.totalAddScoreList = totalAddScoreList;
         return this;
     }
 
     /**
-        * 设置 创建人id
-        * @param createUserIdNotList
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreNotList
      */
-        public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
-        this.createUserIdNotList = createUserIdNotList;
+    public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+        this.totalAddScoreNotList = totalAddScoreNotList;
         return this;
     }
 
-
     /**
-    * 设置  更新人id
-    * @param updateUserId
+     * 设置  员工绩效减分总分数汇总
+     * @param totalSubScore
      */
-    public StaffPerformStatQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
+    public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
+        setTotalSubScore(totalSubScore);
         return this;
     }
 
     /**
-    * 设置 开始 更新人id
-    * @param updateUserIdStart
+     * 设置 开始 员工绩效减分总分数汇总
+     * @param totalSubScoreStart
      */
-    public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
+    public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
+        this.totalSubScoreStart = totalSubScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 更新人id
-    * @param updateUserIdEnd
+     * 设置 结束 员工绩效减分总分数汇总
+     * @param totalSubScoreEnd
      */
-    public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
+    public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
+        this.totalSubScoreEnd = totalSubScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 更新人id
-    * @param updateUserIdIncrement
+     * 设置 增加 员工绩效减分总分数汇总
+     * @param totalSubScoreIncrement
      */
-    public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
+    public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+        this.totalSubScoreIncrement = totalSubScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreList
      */
-    public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
-        this.updateUserIdList = updateUserIdList;
+    public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
         return this;
     }
 
     /**
-        * 设置 更新人id
-        * @param updateUserIdNotList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreNotList
      */
-        public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
-        this.updateUserIdNotList = updateUserIdNotList;
+    public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
         return this;
     }
 
@@ -2914,6 +2785,114 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
         return this;
     }
 
+    /**
+     * 设置  投诉绩效指标增加分数
+     * @param complainScoreAdd
+     */
+    public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
+        setComplainScoreAdd(complainScoreAdd);
+        return this;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标增加分数
+     * @param complainScoreAddStart
+     */
+    public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
+        this.complainScoreAddStart = complainScoreAddStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标增加分数
+     * @param complainScoreAddEnd
+     */
+    public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
+        this.complainScoreAddEnd = complainScoreAddEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标增加分数
+     * @param complainScoreAddIncrement
+     */
+    public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+        this.complainScoreAddIncrement = complainScoreAddIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddList
+     */
+    public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
+        this.complainScoreAddList = complainScoreAddList;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddNotList
+     */
+    public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+        this.complainScoreAddNotList = complainScoreAddNotList;
+        return this;
+    }
+
+    /**
+     * 设置  投诉绩效指标扣减分数
+     * @param complainScoreSub
+     */
+    public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
+        setComplainScoreSub(complainScoreSub);
+        return this;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标扣减分数
+     * @param complainScoreSubStart
+     */
+    public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
+        this.complainScoreSubStart = complainScoreSubStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标扣减分数
+     * @param complainScoreSubEnd
+     */
+    public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
+        this.complainScoreSubEnd = complainScoreSubEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标扣减分数
+     * @param complainScoreSubIncrement
+     */
+    public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+        this.complainScoreSubIncrement = complainScoreSubIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubList
+     */
+    public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubNotList
+     */
+    public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
+        return this;
+    }
+
     /**
      * 设置  办件绩效指标增加分数
      * @param workScoreAdd
@@ -3224,287 +3203,308 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * 设置 其它绩效指标扣减分数
      * @param otherScoreSubList
      */
-    public StaffPerformStatQuery otherScoreSubList(List<BigDecimal> otherScoreSubList){
-        this.otherScoreSubList = otherScoreSubList;
+    public StaffPerformStatQuery otherScoreSubList(List<BigDecimal> otherScoreSubList){
+        this.otherScoreSubList = otherScoreSubList;
+        return this;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubNotList
+     */
+    public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
+        this.otherScoreSubNotList = otherScoreSubNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 备注
+     * @param remark
+     */
+    public StaffPerformStatQuery remark(String remark){
+        setRemark(remark);
         return this;
     }
 
     /**
-        * 设置 其它绩效指标扣减分数
-        * @param otherScoreSubNotList
+     * 设置 备注
+     * @param remarkList
      */
-        public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
-        this.otherScoreSubNotList = otherScoreSubNotList;
+    public StaffPerformStatQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
         return this;
     }
 
     /**
-    * 设置  日
-    * @param day
+     * 设置  年
+     * @param year
      */
-    public StaffPerformStatQuery day(Integer day){
-	    setDay(day);
+    public StaffPerformStatQuery year(Integer year){
+        setYear(year);
         return this;
     }
 
     /**
-    * 设置 开始 日
-    * @param dayStart
+     * 设置 开始 年
+     * @param yearStart
      */
-    public StaffPerformStatQuery dayStart(Integer dayStart){
-		this.dayStart = dayStart;
+    public StaffPerformStatQuery yearStart(Integer yearStart){
+        this.yearStart = yearStart;
         return this;
     }
 
     /**
-    * 设置 结束 日
-    * @param dayEnd
+     * 设置 结束 年
+     * @param yearEnd
      */
-    public StaffPerformStatQuery dayEnd(Integer dayEnd){
-		this.dayEnd = dayEnd;
+    public StaffPerformStatQuery yearEnd(Integer yearEnd){
+        this.yearEnd = yearEnd;
         return this;
     }
 
     /**
-    * 设置 增加 日
-    * @param dayIncrement
+     * 设置 增加 年
+     * @param yearIncrement
      */
-    public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
-		this.dayIncrement = dayIncrement;
+    public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
+        this.yearIncrement = yearIncrement;
         return this;
     }
 
     /**
-    * 设置 日
-    * @param dayList
+     * 设置 年
+     * @param yearList
      */
-    public StaffPerformStatQuery dayList(List<Integer> dayList){
-        this.dayList = dayList;
+    public StaffPerformStatQuery yearList(List<Integer> yearList){
+        this.yearList = yearList;
         return this;
     }
 
     /**
-        * 设置 日
-        * @param dayNotList
+     * 设置 年
+     * @param yearNotList
      */
-        public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
-        this.dayNotList = dayNotList;
+    public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
+        this.yearNotList = yearNotList;
         return this;
     }
 
     /**
-    * 设置  员工绩效加分总分数汇总
-    * @param totalAddScore
+     * 设置  月
+     * @param month
      */
-    public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
-	    setTotalAddScore(totalAddScore);
+    public StaffPerformStatQuery month(Integer month){
+        setMonth(month);
         return this;
     }
 
     /**
-    * 设置 开始 员工绩效加分总分数汇总
-    * @param totalAddScoreStart
+     * 设置 开始 月
+     * @param monthStart
      */
-    public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
-		this.totalAddScoreStart = totalAddScoreStart;
+    public StaffPerformStatQuery monthStart(Integer monthStart){
+        this.monthStart = monthStart;
         return this;
     }
 
     /**
-    * 设置 结束 员工绩效加分总分数汇总
-    * @param totalAddScoreEnd
+     * 设置 结束 月
+     * @param monthEnd
      */
-    public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
-		this.totalAddScoreEnd = totalAddScoreEnd;
+    public StaffPerformStatQuery monthEnd(Integer monthEnd){
+        this.monthEnd = monthEnd;
         return this;
     }
 
     /**
-    * 设置 增加 员工绩效加分总分数汇总
-    * @param totalAddScoreIncrement
+     * 设置 增加 月
+     * @param monthIncrement
      */
-    public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
-		this.totalAddScoreIncrement = totalAddScoreIncrement;
+    public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
+        this.monthIncrement = monthIncrement;
         return this;
     }
 
     /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreList
+     * 设置 月
+     * @param monthList
      */
-    public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
-        this.totalAddScoreList = totalAddScoreList;
+    public StaffPerformStatQuery monthList(List<Integer> monthList){
+        this.monthList = monthList;
         return this;
     }
 
     /**
-        * 设置 员工绩效加分总分数汇总
-        * @param totalAddScoreNotList
+     * 设置 月
+     * @param monthNotList
      */
-        public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
-        this.totalAddScoreNotList = totalAddScoreNotList;
+    public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
+        this.monthNotList = monthNotList;
         return this;
     }
 
     /**
-    * 设置  员工绩效减分总分数汇总
-    * @param totalSubScore
+     * 设置  日
+     * @param day
      */
-    public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
-	    setTotalSubScore(totalSubScore);
+    public StaffPerformStatQuery day(Integer day){
+        setDay(day);
         return this;
     }
 
     /**
-    * 设置 开始 员工绩效减分总分数汇总
-    * @param totalSubScoreStart
+     * 设置 开始 日
+     * @param dayStart
      */
-    public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
-		this.totalSubScoreStart = totalSubScoreStart;
+    public StaffPerformStatQuery dayStart(Integer dayStart){
+        this.dayStart = dayStart;
         return this;
     }
 
     /**
-    * 设置 结束 员工绩效减分总分数汇总
-    * @param totalSubScoreEnd
+     * 设置 结束 日
+     * @param dayEnd
      */
-    public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
-		this.totalSubScoreEnd = totalSubScoreEnd;
+    public StaffPerformStatQuery dayEnd(Integer dayEnd){
+        this.dayEnd = dayEnd;
         return this;
     }
 
     /**
-    * 设置 增加 员工绩效减分总分数汇总
-    * @param totalSubScoreIncrement
+     * 设置 增加 日
+     * @param dayIncrement
      */
-    public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
-		this.totalSubScoreIncrement = totalSubScoreIncrement;
+    public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
+        this.dayIncrement = dayIncrement;
         return this;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreList
+     * 设置 日
+     * @param dayList
      */
-    public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
-        this.totalSubScoreList = totalSubScoreList;
+    public StaffPerformStatQuery dayList(List<Integer> dayList){
+        this.dayList = dayList;
         return this;
     }
 
     /**
-        * 设置 员工绩效减分总分数汇总
-        * @param totalSubScoreNotList
+     * 设置 日
+     * @param dayNotList
      */
-        public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
-        this.totalSubScoreNotList = totalSubScoreNotList;
+    public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
+        this.dayNotList = dayNotList;
         return this;
     }
 
+
     /**
-    * 设置  投诉绩效指标增加分数
-    * @param complainScoreAdd
+     * 设置  创建人id
+     * @param createUserId
      */
-    public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
-	    setComplainScoreAdd(complainScoreAdd);
+    public StaffPerformStatQuery createUserId(Long createUserId){
+        setCreateUserId(createUserId);
         return this;
     }
 
     /**
-    * 设置 开始 投诉绩效指标增加分数
-    * @param complainScoreAddStart
+     * 设置 开始 创建人id
+     * @param createUserIdStart
      */
-    public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
-		this.complainScoreAddStart = complainScoreAddStart;
+    public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
         return this;
     }
 
     /**
-    * 设置 结束 投诉绩效指标增加分数
-    * @param complainScoreAddEnd
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
      */
-    public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
-		this.complainScoreAddEnd = complainScoreAddEnd;
+    public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
         return this;
     }
 
     /**
-    * 设置 增加 投诉绩效指标增加分数
-    * @param complainScoreAddIncrement
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
      */
-    public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
-		this.complainScoreAddIncrement = complainScoreAddIncrement;
+    public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
         return this;
     }
 
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddList
+     * 设置 创建人id
+     * @param createUserIdList
      */
-    public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
-        this.complainScoreAddList = complainScoreAddList;
+    public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
         return this;
     }
 
     /**
-        * 设置 投诉绩效指标增加分数
-        * @param complainScoreAddNotList
+     * 设置 创建人id
+     * @param createUserIdNotList
      */
-        public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
-        this.complainScoreAddNotList = complainScoreAddNotList;
+    public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
         return this;
     }
 
+
     /**
-    * 设置  投诉绩效指标扣减分数
-    * @param complainScoreSub
+     * 设置  更新人id
+     * @param updateUserId
      */
-    public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
-	    setComplainScoreSub(complainScoreSub);
+    public StaffPerformStatQuery updateUserId(Long updateUserId){
+        setUpdateUserId(updateUserId);
         return this;
     }
 
     /**
-    * 设置 开始 投诉绩效指标扣减分数
-    * @param complainScoreSubStart
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
      */
-    public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
-		this.complainScoreSubStart = complainScoreSubStart;
+    public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
         return this;
     }
 
     /**
-    * 设置 结束 投诉绩效指标扣减分数
-    * @param complainScoreSubEnd
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
      */
-    public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
-		this.complainScoreSubEnd = complainScoreSubEnd;
+    public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
         return this;
     }
 
     /**
-    * 设置 增加 投诉绩效指标扣减分数
-    * @param complainScoreSubIncrement
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
      */
-    public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
-		this.complainScoreSubIncrement = complainScoreSubIncrement;
+    public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
         return this;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubList
+     * 设置 更新人id
+     * @param updateUserIdList
      */
-    public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
-        this.complainScoreSubList = complainScoreSubList;
+    public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
         return this;
     }
 
     /**
-        * 设置 投诉绩效指标扣减分数
-        * @param complainScoreSubNotList
+     * 设置 更新人id
+     * @param updateUserIdNotList
      */
-        public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
-        this.complainScoreSubNotList = complainScoreSubNotList;
+    public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
         return this;
     }
 

attendance-performance-manager/src/main/resources/bootstrap.yml

@@ -62,4 +62,7 @@ hik:
   protocol: @profiles.hik.protocol@
   appSecret: @profiles.hik.appSecret@
 dingtalk:
-  agentId: 123123
+  agentId: 2652674890
+  AppKey: dingpqzradgfr4efdi2j
+  AppSecret: bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
+

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
 
     <select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType ,'attend' AS performType FROM mortals_xhx_check_attend_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -12,7 +12,7 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType ,'effect' AS performType FROM mortals_xhx_check_effect_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -20,7 +20,7 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType ,'complain' AS performType FROM mortals_xhx_check_complain_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -28,7 +28,7 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType ,'gowork' AS performType FROM mortals_xhx_check_gowork_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -36,7 +36,7 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType ,'review' AS performType FROM mortals_xhx_check_review_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -44,7 +44,7 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType ,'other' AS performType FROM mortals_xhx_check_other_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>

attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapperExt.xml

@@ -4,7 +4,8 @@
 <mapper namespace="com.mortals.xhx.module.feedback.dao.ibatis.FeedbackDaoImpl">
 
     <!-- 问卷反馈人员列表 -->
-    <select id="getFeedbackStaffList" parameterType="long" resultType="com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo">
+    <select id="getFeedbackStaffList" parameterType="com.mortals.xhx.module.feedback.model.FeedbackEntity" resultType="com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo">
+        SELECT * FROM (
             SELECT
                 s.feedbackId,
                 s.staffId,
@@ -21,7 +22,38 @@
             WHERE
                 s.feedbackId = #{feedbackId}
             GROUP BY
-            s.staffId;
+                s.staffId
+        ) AS t WHERE 1=1
+        <if test="backStatus != null">
+            AND t.backStatus = #{backStatus}
+        </if>
+    </select>
+
+    <select id="getFeedbackStaffListCount" parameterType="com.mortals.xhx.module.feedback.model.FeedbackEntity" resultType="int">
+        select count(1) from (
+            SELECT * FROM (
+                SELECT
+                    s.feedbackId,
+                    s.staffId,
+                    s1.`name`,
+                    s1.deptId,
+                    s1.deptName,
+                    s1.positionName,
+                    CASE IFNULL(a.id, 0) WHEN 0 THEN 0 ELSE 1 END AS backStatus,
+                    MAX(a.createTime) AS backTime
+                FROM
+                    mortals_xhx_feedback_staff s
+                    LEFT JOIN mortals_xhx_feedback_answer a ON s.staffId = a.staffId AND s.feedbackId = a.feedbackId
+                    LEFT JOIN mortals_xhx_staff s1 ON s.staffId = s1.id
+                WHERE
+                    s.feedbackId = #{feedbackId}
+                GROUP BY
+                    s.staffId
+            ) AS t WHERE 1=1
+            <if test="backStatus != null">
+                AND t.backStatus = #{backStatus}
+            </if>
+        ) as tt
     </select>
 
     <!-- 问卷单选多选反馈统计 -->

db/add.sql

@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口负责人详细';
 
+
+
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
+CREATE TABLE mortals_xhx_staff_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `staffName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '员工绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '员工绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '员工绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `assessScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `assessScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `workScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `workScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+
+