Merge remote-tracking branch 'origin/master'

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

 <template>
     <div class="page">
         <div class="top">
-            <el-button class="backBtn" @click="$router.back()">返回上一级</el-button>
+            <el-button class="backBtn" size="small" @click="$router.back()">返回上一级</el-button>
             <el-tabs v-model="tabs">
                 <el-tab-pane label="设计问卷" name="1">
-                    <fc-designer style="height: 75vh;" ref="designer" />
-                    <div class="tool">
-                        <!--功能按钮-->
+                    <fc-designer style="height: 79vh;" ref="designer">
+                        <template slot="handle">
+                            <ElButton icon="el-icon-upload" type="success" size="small" @click="showDrawer" round>移动端预览
+                            </ElButton>
+                        </template>
+                    </fc-designer>
+                    <!-- <div class="tool">
                         <el-row>
                             <el-button icon="el-icon-download" type="primary" size="small" @click="getFormJson()"
                                 round>生成表单JSON</el-button>
                             <el-button icon="el-icon-download" type="success" size="small" @click="getFormOption()"
                                 round>生成表单配置</el-button>
-                            <el-button icon="el-icon-upload" type="success" size="small" @click="drawer = true"
-                                round>预览</el-button>
+                            <el-button icon="el-icon-upload" type="primary" size="small" @click="showDrawer"
+                                round>移动端预览</el-button>
                         </el-row>
-                    </div>
+                    </div> -->
 
-                    <el-drawer title="预览" :visible.sync="drawer" :with-header="false">
+                    <el-drawer :visible.sync="drawer" :with-header="false">
                         <div class="showPhone">
-                            <div>预览</div>
+                            <div class="phone">
+                                <div class="phoneContent">
+                                    <form-create :rule="Frule" :option="Fopthion" @submit="onSubmit">
+                                    </form-create>
+                                </div>
+                            </div>
                         </div>
                     </el-drawer>
                 </el-tab-pane>
@@ -29,35 +38,159 @@
 </template>
 
 <script>
+import formCreate from "@form-create/element-ui";
 export default {
     data() {
         return {
             tabs: '1',
-            drawer: false,
+            drawer: 0,
+            Frule: '',
+            Fopthion: '',
         }
     },
+    mounted() {
+        //配置表单基础样式以及按钮展示
+        const option = {
+            "form": {
+                "labelPosition": "top",
+                "size": "mini",
+                "labelWidth": "20%",
+                "hideRequiredAsterisk": false,
+                "showMessage": true,
+                "inlineMessage": false
+            },
+            "submitBtn": true,
+            "resetBtn": false,
+        }
+        this.$refs.designer.setOption(option)
+        //移除组件大类
+        this.$refs.designer.removeMenu('layout',)
+        //移除对应组件
+        this.$refs.designer.removeMenuItem('el-transfer')
+        this.$refs.designer.removeMenuItem('el-alert')
+        this.$refs.designer.removeMenuItem("colorPicker")
+        this.$refs.designer.removeMenuItem("cascader")
+        this.$refs.designer.removeMenuItem("rate")
+        this.$refs.designer.removeMenuItem("slider")
+        this.$refs.designer.removeMenuItem("datePicker")
+        this.$refs.designer.removeMenuItem("timePicker")
+        this.$refs.designer.removeMenuItem("switch")
+        this.$refs.designer.removeMenuItem("tree")
+        //配置组件生成规则---直接配置显示在页面上
+        // const rule = [{ "type": "input", "field": "int", "title": "输入框", "info": "", "_fc_drag_tag": "input", "hidden": false, "display": true }]
+        // this.$refs.designer.setRule(rule)
+    },
     methods: {
+        //预览生成按钮的输出
+        onSubmit(formData) {
+            console.log(formData)
+        },
+        //展示移动端效果
+        showDrawer() {
+            this.drawer = 1
+            this.Frule = formCreate.parseJson(this.getFormJson())
+            this.Fopthion = formCreate.parseJson(this.getFormOption())
+        },
         getFormJson() {
             //FcDesigner 生成的`JSON`
             const FcDesignerRule = this.$refs.designer.getRule();
             console.log(FcDesignerRule)
-
+            return JSON.stringify(FcDesignerRule)
         },
         getFormOption() {
             //FcDesigner 生成的`options`
             const FcDesignerOptions = this.$refs.designer.getOption();
             console.log(FcDesignerOptions)
+            return JSON.stringify(FcDesignerOptions)
         }
     }
 }
 </script>
 
 <style lang="less" scoped>
-.showPhone{
-    border: 1px solid;
+/deep/._fc-l-title {
+    text-align: center;
+    margin-bottom: 10px;
+}
+
+/deep/._fc-l-item {
+    width: 100%;
+    border: 1px solid #1a7af8;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    height: 40px;
+    margin-bottom: 10px;
+    border-radius: 4px;
+
+    ._fc-l-icon {
+        width: 40%;
+        text-align: right;
+        color: #1a7af8;
+    }
+
+
+    ._fc-l-name {
+        width: 50%;
+        text-align: left;
+        color: #1a7af8;
+    }
+}
+
+/deep/._fc-l-item:hover ._fc-l-name {
+    color: #FFF;
+}
+
+/deep/._fc-l-item:hover ._fc-l-icon {
+    color: #FFF;
+}
+
+.showPhone {
     height: 100%;
     width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .phone {
+        width: 378px;
+        height: 770px;
+        background: url('../../../assets/images/phone.png') no-repeat;
+        position: relative;
+
+        .phoneContent {
+            // border: 1px solid;
+            position: absolute;
+            top: 95px;
+            left: 25px;
+            width: 86.5%;
+            height: 75%;
+            box-sizing: border-box;
+            padding: 20px;
+            overflow-y: scroll;
+            overflow-x: hidden;
+        }
+
+        /* 侧边滚动条 */
+        .phoneContent::-webkit-scrollbar {
+            width: 3px;
+        }
+
+        /* 滚动条上的滚动滑块 */
+        .phoneContent::-webkit-scrollbar-thumb {
+            background: #CCCCCC;
+            border-radius: 4px;
+        }
+
+        /* 滚动条轨道 */
+        .phoneContent::-webkit-scrollbar-track {
+            background: #EEEEEE;
+            border-radius: 4px;
+        }
+    }
 }
+
 .backBtn {
     position: absolute;
     right: 20px;
@@ -102,4 +235,21 @@ export default {
     background: #EEEEEE;
     border-radius: 4px;
 }
+/* 侧边滚动条 */
+/deep/._fc-m-drag::-webkit-scrollbar {
+    width: 3px;
+}
+
+/* 滚动条上的滚动滑块 */
+/deep/._fc-m-drag::-webkit-scrollbar-thumb {
+    background: #CCCCCC;
+    border-radius: 4px;
+}
+
+/* 滚动条轨道 */
+/deep/._fc-m-drag::-webkit-scrollbar-track {
+    background: #EEEEEE;
+    border-radius: 4px;
+}
+
 </style>
\ No newline at end of file

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

 <template>
     <div class="page">
-        <LayoutTable :data="tableData" notDel notSearch :config="tableConfig">
+        <LayoutTable :data="tableData" :config="tableConfig">
         </LayoutTable>
 
 
@@ -52,6 +52,9 @@ export default {
         toView(row) {
             this.$refs.drawerform.view(row);
         },
+        goPage(path) {
+            this.$router.push(path)
+        }
 
     },
     data() {
@@ -104,7 +107,7 @@ export default {
                         width: 240,
                         formatter: row => {
                             return (
-                                <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                                <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.goPage} onDel={this.toDel} />
                             );
                         }
                     }

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

@@ -437,3 +437,25 @@ export default {
   }
 }
 </style>
+<style lang="less" scoped>
+.form_content {
+  /deep/.el-col-12 {
+    width: 98% !important;
+  }
+  .content {
+    width: 100%;
+    height: 500px;
+    border: 1px solid #e4e7ed;
+    border-top: 0;
+    padding: 20px;
+    .top {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 10px;
+    }
+  }
+  /deep/.el-tabs__header {
+    margin: 0 !important;
+  }
+}
+</style>

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAttendRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
@@ -13,4 +15,12 @@ import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 public interface CheckAttendRecordService extends ICRUDService<CheckAttendRecordEntity,Long>{
 
     CheckAttendRecordDao getDao();
+
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckAttendRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckComplainRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
@@ -13,4 +15,12 @@ import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 public interface CheckComplainRecordService extends ICRUDService<CheckComplainRecordEntity,Long>{
 
     CheckComplainRecordDao getDao();
+
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckComplainRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckEffectRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
@@ -13,4 +15,12 @@ import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 public interface CheckEffectRecordService extends ICRUDService<CheckEffectRecordEntity,Long>{
 
     CheckEffectRecordDao getDao();
+
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckEffectRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckGoworkRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
@@ -14,5 +16,11 @@ public interface CheckGoworkRecordService extends ICRUDService<CheckGoworkRecord
 
     CheckGoworkRecordDao getDao();
 
-
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckGoworkRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckOtherRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
@@ -13,4 +15,12 @@ import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 public interface CheckOtherRecordService extends ICRUDService<CheckOtherRecordEntity,Long>{
 
     CheckOtherRecordDao getDao();
+
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckOtherRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckReviewRecordService.java

 package com.mortals.xhx.module.check.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
@@ -13,4 +15,12 @@ import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 public interface CheckReviewRecordService extends ICRUDService<CheckReviewRecordEntity,Long>{
 
     CheckReviewRecordDao getDao();
+
+    /**
+     * 核查人工审核
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    void examine(CheckReviewRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckAttendRecordService
 * 考勤绩效记录核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkAttendRecordService")
 @Slf4j
 public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckAttendRecordDao, CheckAttendRecordEntity, Long> implements CheckAttendRecordService {
-    
+
+    @Override
+    public void examine(CheckAttendRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.service.CheckComplainRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckComplainRecordService
 * 评价绩效投诉核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkComplainRecordService")
 @Slf4j
 public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<CheckComplainRecordDao, CheckComplainRecordEntity, Long> implements CheckComplainRecordService {
-    
+
+    @Override
+    public void examine(CheckComplainRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.service.CheckEffectRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckEffectRecordService
 * 效能绩效核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkEffectRecordService")
 @Slf4j
 public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckEffectRecordDao, CheckEffectRecordEntity, Long> implements CheckEffectRecordService {
-    
+
+    @Override
+    public void examine(CheckEffectRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckGoworkRecordService
 * 办件绩效核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkGoworkRecordService")
 @Slf4j
 public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckGoworkRecordDao, CheckGoworkRecordEntity, Long> implements CheckGoworkRecordService {
-    
+
+    @Override
+    public void examine(CheckGoworkRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.service.CheckOtherRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckOtherRecordService
 * 其它绩效核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkOtherRecordService")
 @Slf4j
 public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOtherRecordDao, CheckOtherRecordEntity, Long> implements CheckOtherRecordService {
-    
+
+    @Override
+    public void examine(CheckOtherRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
+import com.mortals.framework.service.IUser;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
 /**
 * CheckReviewRecordService
 * 评价差评绩效核查信息 service实现
@@ -17,5 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 @Service("checkReviewRecordService")
 @Slf4j
 public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckReviewRecordDao, CheckReviewRecordEntity, Long> implements CheckReviewRecordService {
-    
+
+    @Override
+    public void examine(CheckReviewRecordEntity entity, Context context) throws AppException {
+        if(entity.getId()==null){
+            throw new AppException("核查记录ID不能为空");
+        }
+        if (context != null && context.getUser()!=null) {
+            IUser user = context.getUser();
+            entity.setUpdateUserId(user.getId());
+            entity.setCheckPerson(user.getRealName());
+        }
+        entity.setCheckTime(new Date());
+        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
+        dao.update(entity);
+    }
 }
\ No newline at end of file

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.annotation.RepeatSubmit;
+import com.mortals.framework.model.BaseEntity;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.framework.utils.ReflectUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,12 +19,10 @@ 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.*;
 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.*;
@@ -44,8 +48,40 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
     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"));
         super.init(model, context);
     }
 
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckAttendRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 
 }
\ No newline at end of file

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

@@ -48,4 +48,35 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
     }
 
 
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckComplainRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file

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

@@ -47,6 +47,36 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
         super.init(model, context);
     }
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckEffectRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
 
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 
 }
\ No newline at end of file

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

@@ -47,5 +47,35 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckGoworkRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
 
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file

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

@@ -47,6 +47,36 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
         super.init(model, context);
     }
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckOtherRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
 
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 
 }
\ No newline at end of file

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

@@ -49,5 +49,36 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
+    /**
+     * 审核
+     * @param entity
+     * @return
+     */
+    @PostMapping({"examine"})
+    public String examine(@RequestBody CheckReviewRecordEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "考勤绩效核查审核";
+        try {
+            this.service.examine(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 
 }
\ No newline at end of file

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

@@ -991,6 +991,38 @@ public class FeedbackQuery extends FeedbackEntity {
         this.formContentNotList = formContentNotList;
     }
 
+    /**
+     * 获取 表单内容
+     * @return formContentList
+     */
+    public List<String> getFormContentList(){
+        return this.formContentList;
+    }
+
+    /**
+     * 设置 表单内容
+     * @param formContentList
+     */
+    public void setFormContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+    }
+
+    /**
+     * 获取 表单内容
+     * @return formContentNotList
+     */
+    public List<String> getFormContentNotList(){
+        return this.formContentNotList;
+    }
+
+    /**
+     * 设置 表单内容
+     * @param formContentNotList
+     */
+    public void setFormContentNotList(List<String> formContentNotList){
+        this.formContentNotList = formContentNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1430,7 +1462,6 @@ public class FeedbackQuery extends FeedbackEntity {
     }
 
 
-
     /**
      * 设置 表单内容
      * @param formContent