4-10

430438cf · dll · b8053e6c · dfb0ca55 · 430438cf · 430438cf
Commit 430438cf authored Apr 10, 2023 by dll
41 changed files
--- a/attendance-performance-manager-ui/admin/public/icon.txt
+++ b/attendance-performance-manager-ui/admin/public/icon.txt
+platform-eleme
+eleme
+delete-solid
+delete
+s-tools
+setting
+user-solid
+user
+phone
+phone-outline
+more
+more-outline
+star-on
+star-off
+s-goods
+goods
+warning
+warning-outline
+question
+info
+remove
+circle-plus
+success
+error
+zoom-in
+zoom-out
+remove-outline
+circle-plus-outline
+circle-check
+circle-close
+s-help
+help
+minus
+plus
+check
+close
+picture
+picture-outline
+picture-outline-round
+upload
+upload2
+download
+camera-solid
+camera
+video-camera-solid
+video-camera
+message-solid
+bell
+s-cooperation
+s-order
+s-platform
+s-fold
+s-unfold
+s-operation
+s-promotion
+s-home
+s-release
+s-ticket
+s-management
+s-open
+s-shop
+s-marketing
+s-flag
+s-comment
+s-finance
+s-claim
+s-custom
+s-opportunity
+s-data
+s-check
+s-grid
+menu
+share
+d-caret
+caret-left
+caret-right
+caret-bottom
+caret-top
+bottom-left
+bottom-right
+back
+right
+bottom
+top
+top-left
+top-right
+arrow-left
+arrow-right
+arrow-down
+arrow-up
+d-arrow-left
+d-arrow-right
+video-pause
+video-play
+refresh
+refresh-right
+refresh-left
+finished
+sort
+sort-up
+sort-down
+rank
+loading
+view
+c-scale-to-original
+date
+edit
+edit-outline
+folder
+folder-opened
+folder-add
+folder-remove
+folder-delete
+folder-checked
+tickets
+document-remove
+document-delete
+document-copy
+document-checked
+document
+document-add
+printer
+paperclip
+takeaway-box
+search
+monitor
+attract
+mobile
+scissors
+umbrella
+headset
+brush
+mouse
+coordinate
+magic-stick
+reading
+data-line
+data-board
+pie-chart
+data-analysis
+collection-tag
+film
+suitcase
+suitcase-1
+receiving
+collection
+files
+notebook-1
+notebook-2
+toilet-paper
+office-building
+school
+table-lamp
+house
+no-smoking
+smoking
+shopping-cart-full
+shopping-cart-1
+shopping-cart-2
+shopping-bag-1
+shopping-bag-2
+sold-out
+sell
+present
+box
+bank-card
+money
+coin
+wallet
+discount
+price-tag
+news
+guide
+male
+female
+thumb
+cpu
+link
+connection
+open
+turn-off
+set-up
+chat-round
+chat-line-round
+chat-square
+chat-dot-round
+chat-dot-square
+chat-line-square
+message
+postcard
+position
+turn-off-microphone
+microphone
+close-notification
+bangzhu
+time
+odometer
+crop
+aim
+switch-button
+full-screen
+copy-document
+mic
+stopwatch
+medal-1
+medal
+trophy
+trophy-1
+first-aid-kit
+discover
+place
+location
+location-outline
+location-information
+add-location
+delete-location
+map-location
+alarm-clock
+timer
+watch-1
+watch
+lock
+unlock
+key
+service
+mobile-phone
+bicycle
+truck
+ship
+basketball
+football
+soccer
+baseball
+wind-power
+light-rain
+lightning
+heavy-rain
+sunrise
+sunrise-1
+sunset
+sunny
+cloudy
+partly-cloudy
+cloudy-and-sunny
+moon
+moon-night
+dish
+dish-1
+food
+chicken
+fork-spoon
+knife-fork
+burger
+tableware
+sugar
+dessert
+ice-cream
+hot-water
+water-cup
+coffee-cup
+cold-drink
+goblet
+goblet-full
+goblet-square
+goblet-square-full
+refrigerator
+grape
+watermelon
+cherry
+apple
+pear
+orange
+coffee
+ice-tea
+ice-drink
+milk-tea
+potato-strips
+lollipop
+ice-cream-square
+ice-cream-round
--- a/attendance-performance-manager-ui/admin/src/components/Form.vue
+++ b/attendance-performance-manager-ui/admin/src/components/Form.vue
@@ -8,7 +8,7 @@
 </template>

 <style lang="less">
-@media screen and (max-width: 800px){
+@media screen and (max-width: 1440px){
  .layout-form{
    form{
      width: 100%!important;
@@ -25,7 +25,7 @@
    border-bottom: 1px solid #ededed;
  }
  form{
-    width: 800px;
+    width: 1440px;
    &[loading]{
      pointer-events: none;
      .el-button{

--- a/attendance-performance-manager-ui/admin/src/views/staff/care/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/care/list.vue
 <template>
  <div class="page">
    <LayoutTable :data="tableData" :config="tableConfig">
+      <el-button
+          slot="table-head-left2"
+          style="margin-left: 10px"
+          icon="el-icon-tickets"
+          size="mini"
+          @click="handleImport"
+      >导入</el-button>
+      <el-button
+          slot="table-head-left2"
+          style="margin-left: 10px"
+          icon="el-icon-tickets"
+          size="mini"
+          @click="doExport"
+          :disabled="isExport"
+      >导出</el-button>
    </LayoutTable>

+    <!-- 员工关怀信息导入对话框 -->
+    <el-dialog
+        :title="upload.title"
+        :visible.sync="upload.open"
+        width="400px"
+        append-to-body
+    >
+      <el-upload
+          ref="upload"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :auto-upload="false"
+          drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox
+              v-model="upload.updateSupport"
+          />是否更新已经存在的数据
+          <el-link type="primary" style="font-size: 14px" @click="downloadTemplate"
+          >下载模板</el-link
+          >
+        </div>
+        <div class="el-upload__tip" style="color: red" slot="tip">
+          提示：仅允许导入“xls”或“xlsx”格式文件！
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>

    <drawer-show ref="drawerform" @ok="getData" />
  </div>
 </template>

 <script>
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import table from "@/assets/mixins/table";
-    export default {
+/** 表单弹出框模式需引入 */
+import drawerShow from "./drawershow";
+import table from "@/assets/mixins/table";
+export default {
  name: "StaffCareList",
  components: {
    drawerShow
-},
+  },
  mixins: [table],
  created() {
  },
  methods: {
+    /** 导入 */
+    handleImport() {
+      this.upload.title = "员工关怀信息导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    downloadTemplate() {
+      this.isExport = true;
+      this.$download("/staff/care/downloadTemplate", {}, { type: "excel" })
+          .then(() => (this.isExport = false))
+          .catch((error) => {
+            this.isExport = false;
+            this.$message.error(error.message);
+          });
+    },
+    /** 文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    /** 文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getData();
+    },
+    /** 提交上传文件 */
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 导出Excel */
+    doExport() {
+      this.isExport = true;
+      this.$download("/staff/care/exportExcel", {
+        "idList": this.selection,
+        'staffName': this.$route.query['staffName'],
+        'careType': this.$route.query['careType'],
+        'sendStatus': this.$route.query['sendStatus'],
+      }, { type: "excel" }).then(() => this.isExport = false).catch(error => {
+        this.isExport = false;
+        this.$message.error(error.message);
+      });
+    },
    /** 重写新增方法 */
    toAdd(row) {
      this.$refs.drawerform.add(row);
@@ -33,12 +133,23 @@
    toView(row) {
      this.$refs.drawerform.view(row);
    },
-
-        },
  data() {
    return {
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（员工关怀信息导入）
+        open: false,
+        // 弹出层标题（员工关怀信息导入）
+        title: "导入员工关怀信息数据",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的数据
+        updateSupport: 0,
+        // 上传的地址
+        url: "/attendance/staff/care/importData",
+      },
+      isExport: false,
      config: {
-                    isshowTabPane:true,
        search: [
          {
            name: "staffName",
@@ -50,7 +161,6 @@
        columns: [
          {type: "selection", width: 60},
          {type: "index",label: "序号",width: 50},
-
          {label: "员工姓名", prop: "staffName"},

          {label: "入职时间", prop: "entryDate", formatter: this.formatterDate},
@@ -71,7 +181,8 @@
          }
        ]
      }
-            };
      }
-    };
+    }
+   }
+}
 </script>
\ No newline at end of file
--- a/attendance-performance-manager-ui/admin/src/views/system/menu/show.vue
+++ b/attendance-performance-manager-ui/admin/src/views/system/menu/show.vue
 <template>
-  <layout-form>
+  <layout-form >
    <el-form
      :model="form"
      :loading="loading"
@@ -8,7 +8,7 @@
      label-width='100px'
      ref="form"
    >
-      <el-row>
+      <el-row :span='20'>
        <Field label="ID" prop="id" v-model="form.id" v-if='pageInfo.type !== "add"' disabled />
        <Field label="名称" prop="name" v-model="form.name"/>
        <Field label="权限类型" prop="authType" v-model="form.authType" :enumData='dict.authType' type='select' />
@@ -19,7 +19,7 @@
          <el-radio-group v-model="form.imgPath" class='form-el-radio-group'>
            <el-radio-button label="">不需要图标</el-radio-button>
            <el-radio-button v-for='(icon, index) in icons' :key='index' :label="icon">
-              <i :class="'el-icon-'+icon"></i>
+              <i :class="'el-icon-'+icon" style="font-size: 20px"></i>
              {{icon}}
            </el-radio-button>
          </el-radio-group>
@@ -32,7 +32,7 @@

 <script>
 import form from '@/assets/mixins/form';
-
+import axios from 'axios'
 export default {
  mixins: [form],
  methods: {
@@ -40,28 +40,36 @@ export default {
      this.$store.dispatch('login');
      this.$router.go(-1);
    },
-    // 合并父子数组
-    combineArr(Array,menu){
-      Array.forEach(item => {
-        if(item.childList.length>0){
-          menu[item.id+''] = item.name
-          this.combineArr(item.childList,menu)
-        }else{
-          menu[item.id+''] = item.name
-        }
+  },
+  created() {
+    axios.get('/icon.txt')
+        .then(response => {
+          this.fileContent = response.data
+          this.icons = this.fileContent.split('\n')
+          //this.lines.map(i=>console.log(i))
        })
-    }
  },
+
  computed: {
    menu() {
      let menu = {'0': '无'};
-      this.combineArr(this.$store.state.userData.barList,menu)
-      console.log(menu)
+      this.$store.state.userData.barList.forEach(item=>{
+        menu[item.id+''] = item.name
+      });
      return menu;
    }
  },
+  // mounted() {
+  //   axios.get('/icon.txt')
+  //       .then(response => {
+  //         this.fileContent = response.data
+  //         this.lines = this.fileContent.split('\n')
+  //         this.lines.map(i=>console.log(i))
+  //       })
+  // },
  data() {
    return {
+      fileContent:"",
      toString: ['parentId', 'authType', 'status'],
      icons: [
        'info', 'error', 'success', 'warning', 'question',

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/config/JsonUtils.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/config/JsonUtils.java
+package com.mortals.xhx.base.framework.config;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+/**
+ * @author djx
+ * @date 2023年04月10日 11:53
+ */
+@Component
+public class JsonUtils {
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    public String bean2Json(Object data) {
+        try {
+            String result = objectMapper.writeValueAsString(data);
+            return result;
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public <T> T json2Bean(String jsonData, Class<T> beanType) {
+        try {
+            T result = objectMapper.readValue(jsonData, beanType);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public <T> List<T> json2List(String jsonData, Class<T> beanType) {
+        JavaType javaType = objectMapper.getTypeFactory().constructParametricType(List.class, beanType);
+        try {
+            List<T> resultList = objectMapper.readValue(jsonData, javaType);
+            return resultList;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public <K, V> Map<K, V> json2Map(String jsonData, Class<K> keyType, Class<V> valueType) {
+        JavaType javaType = objectMapper.getTypeFactory().constructMapType(Map.class, keyType, valueType);
+        try {
+            Map<K, V> resultMap = objectMapper.readValue(jsonData, javaType);
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
+
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/hik/ArtemisPostTest.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/hik/ArtemisPostTest.java
@@ -94,6 +94,35 @@ public class ArtemisPostTest {
 	}


+
+
+
+
+
+	public static String callPostApiGetDeptList() throws Exception {
+		/**
+		 * https://ip:port/artemis/api/resource/v1/org/orgList
+		 * 通过查阅AI Cloud开放平台文档或网关门户的文档可以看到获取组织列表的接口定义,该接口为POST请求的Rest接口, 入参为JSON字符串，接口协议为https。
+		 * ArtemisHttpUtil工具类提供了doPostStringArtemis调用POST请求的方法，入参可传JSON字符串, 请阅读开发指南了解方法入参，没有的参数可传null
+		 */
+		ArtemisConfig config = new ArtemisConfig();
+		config.setHost("8.136.255.30:8001"); // 代理API网关nginx服务器ip端口
+		config.setAppKey("25128371");  // 秘钥appkey
+		config.setAppSecret("2m9RcPJOKq5j2QPQM4v5");// 秘钥appSecret
+		final String getCamsApi = ARTEMIS_PATH + "/api/resource/v1/person/personList";
+		Map<String, String> paramMap = new HashMap<String, String>();// post请求Form表单参数
+		paramMap.put("pageNo", "1");
+		paramMap.put("pageSize", "10");
+		String body = JSON.toJSON(paramMap).toString();
+		Map<String, String> path = new HashMap<String, String>(2) {
+			{
+				put("http://", getCamsApi);
+			}
+		};
+		return ArtemisHttpUtil.doPostStringArtemis(config,path, body, null, null, "application/json");
+	}
+
+
 	/**
 	 * 调用POST请求类型接口，这里以分页获取区域列表为例
 	 * 接口实际url：https://ip:port/artemis/api/api/resource/v1/regions

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeptHikData.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeptHikData.java
+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author djx
+ * @date 2023年04月10日 11:56
+ */
+@Data
+public class DeptHikData {
+    private int total;
+    private int pageNo;
+    private int pageSize;
+    private List<ListDept> list;
+}
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/ListDept.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/ListDept.java
+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+/**
+ * @author djx
+ * @date 2023年04月10日 11:54
+ */
+@NoArgsConstructor
+@Data
+public class ListDept {
+
+
+    //部门编号--最底层
+    private String orgIndexCode;
+
+    //空
+    private String orgNo;
+
+    //部门名字--底层
+    private String orgName;
+
+    //部门全路径
+    private String orgPath;
+
+    //上级部门编号
+    private String parentOrgIndexCode;
+
+    //上层部门名臣
+    private Object parentOrgName;
+
+    //修改时间
+    private Object updateTime;
+}
+
+
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/ListItem.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/ListItem.java
@@ -4,22 +4,40 @@ import lombok.Data;

 @Data
 public class ListItem{
+	//空
 	private Object birthday;
+	//
 	private String orgName;
+	//空
 	private Object address;
+	//空
 	private Object education;
+	//性别
 	private int gender;
+	//部门全路径
 	private String orgPath;
+	//空
 	private Object nation;
+	//部门code
 	private String orgIndexCode;
+
 	private String updateTime;
+	//证书
 	private String certificateNo;
+	//空
 	private Object phoneNo;
+	//姓名
 	private String personName;
+	//身份证信息
 	private PersonPhoto personPhoto;
+	//
 	private String jobNo;
+	//海康id
 	private String personId;
+	//指纹
 	private Object fingerPrint;
+	//空
 	private Object email;
+	//
 	private int certificateType;
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AttendanceTypeEnum.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AttendanceTypeEnum.java
@@ -9,10 +9,10 @@ import java.util.Map;
 * @author zxfei
 */
 public enum AttendanceTypeEnum {
-    地点打卡. 地点打卡("地点打卡. 地点打卡", "地点打卡. 地点打卡"),
-    Wi-Fi打卡. Wi-Fi打卡("Wi-Fi打卡. Wi-Fi打卡", "Wi-Fi打卡. Wi-Fi打卡"),
-    蓝牙打卡. 蓝牙打卡("蓝牙打卡. 蓝牙打卡", "蓝牙打卡. 蓝牙打卡"),
-    考勤机打卡. 考勤机打卡("考勤机打卡. 考勤机打卡", "考勤机打卡. 考勤机打卡");
+    地点打卡("地点打卡", "地点打卡"),
+    WiFi打卡("Wi-Fi打卡", "Wi-Fi打卡"),
+    蓝牙打卡("蓝牙打卡", "蓝牙打卡"),
+    考勤机打卡("考勤机打卡", "考勤机打卡");
    private String value;
    private String desc;


--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialEntity.java
@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceGroupFixedworkSpecialVo;
 /**
-* 考勤组考勤固定班制特殊日期配置实体对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤固定班制特殊日期配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */

 public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedworkSpecialVo {
    private static final long serialVersionUID = 1L;
@@ -42,17 +42,17 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
     */
    private Date specialTime;
    /**
-    * 时间段时候开始时间
+     * 备注
     */
-    private Date specialTimeStart;
+    private String remark;
    /**
-    * 时间段结束时间
+     * 时间段时候开始时间
     */
-    private Date specialTimeEnd;
+    private Date specialStartTime;
    /**
-    * 备注
+     * 时间段结束时间
     */
-    private String remark;
+    private Date specialEndTime;



@@ -142,46 +142,46 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
        this.specialTime = specialTime;
    }
    /**
-    * 获取 时间段时候开始时间
-    * @return Date
+     * 获取 备注
+     * @return String
     */
-    public Date getSpecialTimeStart(){
-        return specialTimeStart;
+    public String getRemark(){
+        return remark;
    }
    /**
-    * 设置 时间段时候开始时间
-    * @param specialTimeStart
+     * 设置 备注
+     * @param remark
     */
-    public void setSpecialTimeStart(Date specialTimeStart){
-        this.specialTimeStart = specialTimeStart;
+    public void setRemark(String remark){
+        this.remark = remark;
    }
    /**
-    * 获取 时间段结束时间
+     * 获取 时间段时候开始时间
     * @return Date
     */
-    public Date getSpecialTimeEnd(){
-        return specialTimeEnd;
+    public Date getSpecialStartTime(){
+        return specialStartTime;
    }
    /**
-    * 设置 时间段结束时间
-    * @param specialTimeEnd
+     * 设置 时间段时候开始时间
+     * @param specialStartTime
     */
-    public void setSpecialTimeEnd(Date specialTimeEnd){
-        this.specialTimeEnd = specialTimeEnd;
+    public void setSpecialStartTime(Date specialStartTime){
+        this.specialStartTime = specialStartTime;
    }
    /**
-    * 获取 备注
-    * @return String
+     * 获取 时间段结束时间
+     * @return Date
     */
-    public String getRemark(){
-        return remark;
+    public Date getSpecialEndTime(){
+        return specialEndTime;
    }
    /**
-    * 设置 备注
-    * @param remark
+     * 设置 时间段结束时间
+     * @param specialEndTime
     */
-    public void setRemark(String remark){
-        this.remark = remark;
+    public void setSpecialEndTime(Date specialEndTime){
+        this.specialEndTime = specialEndTime;
    }


@@ -211,9 +211,9 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
        sb.append(",className:").append(getClassName());
        sb.append(",addWay:").append(getAddWay());
        sb.append(",specialTime:").append(getSpecialTime());
-        sb.append(",specialTimeStart:").append(getSpecialTimeStart());
-        sb.append(",specialTimeEnd:").append(getSpecialTimeEnd());
        sb.append(",remark:").append(getRemark());
+        sb.append(",specialStartTime:").append(getSpecialStartTime());
+        sb.append(",specialEndTime:").append(getSpecialEndTime());
        return sb.toString();
    }

@@ -231,10 +231,10 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw

        this.specialTime = null;

-            this.specialTimeStart = null;
+        this.remark = "";

-            this.specialTimeEnd = null;
+        this.specialStartTime = null;

-            this.remark = "";
+        this.specialEndTime = null;
    }
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialQuery.java
@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.attendance.model.AttendanceGroupFixedworkSpecialEntity;
 /**
-* 考勤组考勤固定班制特殊日期配置查询对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤固定班制特殊日期配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedworkSpecialEntity {
    /** 开始 序号，主键，自增长 */
    private Long idStart;
@@ -96,18 +96,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
    /** 结束 特殊时间 */
    private String specialTimeEnd;

-    /** 开始 时间段时候开始时间 */
-    private String specialTimeStartStart;
-
-    /** 结束 时间段时候开始时间 */
-    private String specialTimeStartEnd;
-
-    /** 开始 时间段结束时间 */
-    private String specialTimeEndStart;
-
-    /** 结束 时间段结束时间 */
-    private String specialTimeEndEnd;
-
    /** 备注 */
    private List<String> remarkList;

@@ -155,6 +143,18 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
    /** 结束 更新时间 */
    private String updateTimeEnd;

+    /** 开始 时间段时候开始时间 */
+    private String specialStartTimeStart;
+
+    /** 结束 时间段时候开始时间 */
+    private String specialStartTimeEnd;
+
+    /** 开始 时间段结束时间 */
+    private String specialEndTimeStart;
+
+    /** 结束 时间段结束时间 */
+    private String specialEndTimeEnd;
+
    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
    private List<AttendanceGroupFixedworkSpecialQuery> orConditionList;

@@ -632,70 +632,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
        this.specialTimeEnd = specialTimeEnd;
    }

-    /**
-    * 获取 开始 时间段时候开始时间
-    * @return specialTimeStartStart
-    */
-    public String getSpecialTimeStartStart(){
-        return this.specialTimeStartStart;
-    }
-
-    /**
-    * 设置 开始 时间段时候开始时间
-    * @param specialTimeStartStart
-    */
-    public void setSpecialTimeStartStart(String specialTimeStartStart){
-        this.specialTimeStartStart = specialTimeStartStart;
-    }
-
-    /**
-    * 获取 结束 时间段时候开始时间
-    * @return specialTimeStartEnd
-    */
-    public String getSpecialTimeStartEnd(){
-        return this.specialTimeStartEnd;
-    }
-
-    /**
-    * 设置 结束 时间段时候开始时间
-    * @param specialTimeStartEnd
-    */
-    public void setSpecialTimeStartEnd(String specialTimeStartEnd){
-        this.specialTimeStartEnd = specialTimeStartEnd;
-    }
-
-    /**
-    * 获取 开始 时间段结束时间
-    * @return specialTimeEndStart
-    */
-    public String getSpecialTimeEndStart(){
-        return this.specialTimeEndStart;
-    }
-
-    /**
-    * 设置 开始 时间段结束时间
-    * @param specialTimeEndStart
-    */
-    public void setSpecialTimeEndStart(String specialTimeEndStart){
-        this.specialTimeEndStart = specialTimeEndStart;
-    }
-
-    /**
-    * 获取 结束 时间段结束时间
-    * @return specialTimeEndEnd
-    */
-    public String getSpecialTimeEndEnd(){
-        return this.specialTimeEndEnd;
-    }
-
-    /**
-    * 设置 结束 时间段结束时间
-    * @param specialTimeEndEnd
-    */
-    public void setSpecialTimeEndEnd(String specialTimeEndEnd){
-        this.specialTimeEndEnd = specialTimeEndEnd;
-    }
-
    /**
     * 获取 备注
     * @return remarkList
@@ -954,6 +890,70 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
        this.updateTimeEnd = updateTimeEnd;
    }

+    /**
+     * 获取 开始 时间段时候开始时间
+     * @return specialStartTimeStart
+     */
+    public String getSpecialStartTimeStart(){
+        return this.specialStartTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段时候开始时间
+     * @param specialStartTimeStart
+     */
+    public void setSpecialStartTimeStart(String specialStartTimeStart){
+        this.specialStartTimeStart = specialStartTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段时候开始时间
+     * @return specialStartTimeEnd
+     */
+    public String getSpecialStartTimeEnd(){
+        return this.specialStartTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段时候开始时间
+     * @param specialStartTimeEnd
+     */
+    public void setSpecialStartTimeEnd(String specialStartTimeEnd){
+        this.specialStartTimeEnd = specialStartTimeEnd;
+    }
+
+    /**
+     * 获取 开始 时间段结束时间
+     * @return specialEndTimeStart
+     */
+    public String getSpecialEndTimeStart(){
+        return this.specialEndTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段结束时间
+     * @param specialEndTimeStart
+     */
+    public void setSpecialEndTimeStart(String specialEndTimeStart){
+        this.specialEndTimeStart = specialEndTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段结束时间
+     * @return specialEndTimeEnd
+     */
+    public String getSpecialEndTimeEnd(){
+        return this.specialEndTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段结束时间
+     * @param specialEndTimeEnd
+     */
+    public void setSpecialEndTimeEnd(String specialEndTimeEnd){
+        this.specialEndTimeEnd = specialEndTimeEnd;
+    }
+
    /**
     * 设置  序号，主键，自增长
     * @param id
@@ -1245,8 +1245,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo



-
-
    /**
     * 设置 备注
     * @param remark
@@ -1375,6 +1373,8 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
    }


+
+
    /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialEntity.java
@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceGroupFreeworkSpecialVo;
 /**
-* 考勤组考勤自由工时特殊日期配置实体对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤自由工时特殊日期配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */

 public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreeworkSpecialVo {
    private static final long serialVersionUID = 1L;
@@ -42,17 +42,17 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
     */
    private Date specialTime;
    /**
-    * 时间段时候开始时间
+     * 备注
     */
-    private Date specialTimeStart;
+    private String remark;
    /**
-    * 时间段结束时间
+     * 时间段时候开始时间
     */
-    private Date specialTimeEnd;
+    private Date specialStartTime;
    /**
-    * 备注
+     * 时间段结束时间
     */
-    private String remark;
+    private Date specialEndTime;



@@ -142,46 +142,46 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
        this.specialTime = specialTime;
    }
    /**
-    * 获取 时间段时候开始时间
-    * @return Date
+     * 获取 备注
+     * @return String
     */
-    public Date getSpecialTimeStart(){
-        return specialTimeStart;
+    public String getRemark(){
+        return remark;
    }
    /**
-    * 设置 时间段时候开始时间
-    * @param specialTimeStart
+     * 设置 备注
+     * @param remark
     */
-    public void setSpecialTimeStart(Date specialTimeStart){
-        this.specialTimeStart = specialTimeStart;
+    public void setRemark(String remark){
+        this.remark = remark;
    }
    /**
-    * 获取 时间段结束时间
+     * 获取 时间段时候开始时间
     * @return Date
     */
-    public Date getSpecialTimeEnd(){
-        return specialTimeEnd;
+    public Date getSpecialStartTime(){
+        return specialStartTime;
    }
    /**
-    * 设置 时间段结束时间
-    * @param specialTimeEnd
+     * 设置 时间段时候开始时间
+     * @param specialStartTime
     */
-    public void setSpecialTimeEnd(Date specialTimeEnd){
-        this.specialTimeEnd = specialTimeEnd;
+    public void setSpecialStartTime(Date specialStartTime){
+        this.specialStartTime = specialStartTime;
    }
    /**
-    * 获取 备注
-    * @return String
+     * 获取 时间段结束时间
+     * @return Date
     */
-    public String getRemark(){
-        return remark;
+    public Date getSpecialEndTime(){
+        return specialEndTime;
    }
    /**
-    * 设置 备注
-    * @param remark
+     * 设置 时间段结束时间
+     * @param specialEndTime
     */
-    public void setRemark(String remark){
-        this.remark = remark;
+    public void setSpecialEndTime(Date specialEndTime){
+        this.specialEndTime = specialEndTime;
    }


@@ -211,9 +211,9 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
        sb.append(",className:").append(getClassName());
        sb.append(",addWay:").append(getAddWay());
        sb.append(",specialTime:").append(getSpecialTime());
-        sb.append(",specialTimeStart:").append(getSpecialTimeStart());
-        sb.append(",specialTimeEnd:").append(getSpecialTimeEnd());
        sb.append(",remark:").append(getRemark());
+        sb.append(",specialStartTime:").append(getSpecialStartTime());
+        sb.append(",specialEndTime:").append(getSpecialEndTime());
        return sb.toString();
    }

@@ -231,10 +231,10 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor

        this.specialTime = null;

-            this.specialTimeStart = null;
+        this.remark = "";

-            this.specialTimeEnd = null;
+        this.specialStartTime = null;

-            this.remark = "";
+        this.specialEndTime = null;
    }
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialQuery.java
@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.attendance.model.AttendanceGroupFreeworkSpecialEntity;
 /**
-* 考勤组考勤自由工时特殊日期配置查询对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤自由工时特殊日期配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreeworkSpecialEntity {
    /** 开始 序号，主键，自增长 */
    private Long idStart;
@@ -96,18 +96,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
    /** 结束 特殊时间 */
    private String specialTimeEnd;

-    /** 开始 时间段时候开始时间 */
-    private String specialTimeStartStart;
-
-    /** 结束 时间段时候开始时间 */
-    private String specialTimeStartEnd;
-
-    /** 开始 时间段结束时间 */
-    private String specialTimeEndStart;
-
-    /** 结束 时间段结束时间 */
-    private String specialTimeEndEnd;
-
    /** 备注 */
    private List<String> remarkList;

@@ -155,6 +143,18 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
    /** 结束 更新时间 */
    private String updateTimeEnd;

+    /** 开始 时间段时候开始时间 */
+    private String specialStartTimeStart;
+
+    /** 结束 时间段时候开始时间 */
+    private String specialStartTimeEnd;
+
+    /** 开始 时间段结束时间 */
+    private String specialEndTimeStart;
+
+    /** 结束 时间段结束时间 */
+    private String specialEndTimeEnd;
+
    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
    private List<AttendanceGroupFreeworkSpecialQuery> orConditionList;

@@ -632,70 +632,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
        this.specialTimeEnd = specialTimeEnd;
    }

-    /**
-    * 获取 开始 时间段时候开始时间
-    * @return specialTimeStartStart
-    */
-    public String getSpecialTimeStartStart(){
-        return this.specialTimeStartStart;
-    }
-
-    /**
-    * 设置 开始 时间段时候开始时间
-    * @param specialTimeStartStart
-    */
-    public void setSpecialTimeStartStart(String specialTimeStartStart){
-        this.specialTimeStartStart = specialTimeStartStart;
-    }
-
-    /**
-    * 获取 结束 时间段时候开始时间
-    * @return specialTimeStartEnd
-    */
-    public String getSpecialTimeStartEnd(){
-        return this.specialTimeStartEnd;
-    }
-
-    /**
-    * 设置 结束 时间段时候开始时间
-    * @param specialTimeStartEnd
-    */
-    public void setSpecialTimeStartEnd(String specialTimeStartEnd){
-        this.specialTimeStartEnd = specialTimeStartEnd;
-    }
-
-    /**
-    * 获取 开始 时间段结束时间
-    * @return specialTimeEndStart
-    */
-    public String getSpecialTimeEndStart(){
-        return this.specialTimeEndStart;
-    }
-
-    /**
-    * 设置 开始 时间段结束时间
-    * @param specialTimeEndStart
-    */
-    public void setSpecialTimeEndStart(String specialTimeEndStart){
-        this.specialTimeEndStart = specialTimeEndStart;
-    }
-
-    /**
-    * 获取 结束 时间段结束时间
-    * @return specialTimeEndEnd
-    */
-    public String getSpecialTimeEndEnd(){
-        return this.specialTimeEndEnd;
-    }
-
-    /**
-    * 设置 结束 时间段结束时间
-    * @param specialTimeEndEnd
-    */
-    public void setSpecialTimeEndEnd(String specialTimeEndEnd){
-        this.specialTimeEndEnd = specialTimeEndEnd;
-    }
-
    /**
     * 获取 备注
     * @return remarkList
@@ -954,6 +890,70 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
        this.updateTimeEnd = updateTimeEnd;
    }

+    /**
+     * 获取 开始 时间段时候开始时间
+     * @return specialStartTimeStart
+     */
+    public String getSpecialStartTimeStart(){
+        return this.specialStartTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段时候开始时间
+     * @param specialStartTimeStart
+     */
+    public void setSpecialStartTimeStart(String specialStartTimeStart){
+        this.specialStartTimeStart = specialStartTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段时候开始时间
+     * @return specialStartTimeEnd
+     */
+    public String getSpecialStartTimeEnd(){
+        return this.specialStartTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段时候开始时间
+     * @param specialStartTimeEnd
+     */
+    public void setSpecialStartTimeEnd(String specialStartTimeEnd){
+        this.specialStartTimeEnd = specialStartTimeEnd;
+    }
+
+    /**
+     * 获取 开始 时间段结束时间
+     * @return specialEndTimeStart
+     */
+    public String getSpecialEndTimeStart(){
+        return this.specialEndTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段结束时间
+     * @param specialEndTimeStart
+     */
+    public void setSpecialEndTimeStart(String specialEndTimeStart){
+        this.specialEndTimeStart = specialEndTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段结束时间
+     * @return specialEndTimeEnd
+     */
+    public String getSpecialEndTimeEnd(){
+        return this.specialEndTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段结束时间
+     * @param specialEndTimeEnd
+     */
+    public void setSpecialEndTimeEnd(String specialEndTimeEnd){
+        this.specialEndTimeEnd = specialEndTimeEnd;
+    }
+
    /**
     * 设置  序号，主键，自增长
     * @param id
@@ -1245,8 +1245,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework



-
-
    /**
     * 设置 备注
     * @param remark
@@ -1375,6 +1373,8 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
    }


+
+
    /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceClassServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceClassServiceImpl.java
@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceClassService
 * 考勤班次信息 service实现

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFixedworkServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFixedworkServiceImpl.java
@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupFixedworkSpecial
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupFixedworkService
 * 考勤组考勤固定工时 service实现

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFreeworkServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFreeworkServiceImpl.java
@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupFreeworkSpecialS
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupFreeworkService
 * 考勤组考勤自由工时配置 service实现

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupServiceImpl.java
@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupStaffService;
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupService
 * 考勤组信息 service实现

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java
@@ -21,4 +21,9 @@ public interface  DeptDao extends ICRUDDao<DeptEntity,Long>{
    */
    List<DeptEntity> selectChildrenDeptById(String deptId);

+    /**
+     * 查询所有数据
+     * */
+    List<DeptEntity> queryAllList();
+
 }
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java
 package com.mortals.xhx.module.dept.dao.ibatis;


-import org.springframework.stereotype.Repository;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.module.dept.dao.DeptDao;
 import com.mortals.xhx.module.dept.model.DeptEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import org.springframework.stereotype.Repository;
+
 import java.util.List;
 /**
 * 部门信息DaoImpl DAO接口
@@ -22,4 +22,9 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
        return getSqlSession().selectList(getSqlId("selectChildrenDeptById"), deptId);
    }

+    @Override
+    public List<DeptEntity> queryAllList() {
+        return null;
+    }
+
 }
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java
@@ -2,7 +2,9 @@ package com.mortals.xhx.module.staff.dao;

 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.staff.model.StaffEntity;
+
 import java.util.List;
+
 /**
 * 员工基本信息Dao
 * 员工基本信息 DAO接口
@@ -14,4 +16,9 @@ import java.util.List;
 public interface  StaffDao extends ICRUDDao<StaffEntity,Long>{


+    /**
+     * 查询所有
+     * */
+
+    List<StaffEntity> queryAllList();
 }
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java
 package com.mortals.xhx.module.staff.dao.ibatis;


-import org.springframework.stereotype.Repository;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.module.staff.dao.StaffDao;
 import com.mortals.xhx.module.staff.model.StaffEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import org.springframework.stereotype.Repository;
+
 import java.util.List;
 /**
 * 员工基本信息DaoImpl DAO接口
@@ -17,5 +17,8 @@ import java.util.List;
 public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implements StaffDao {


-
+    @Override
+    public List<StaffEntity> queryAllList() {
+        return null;
+    }
 }
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
 package com.mortals.xhx.module.staff.model;

-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-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.StaffVo;
+
+import java.util.Date;
 /**
 * 员工基本信息实体对象
 *
@@ -93,6 +89,10 @@ public class StaffEntity extends StaffVo {
     * 备注
     */
    private String remark;
+    /**
+     * 备注id
+     */
+    private String remarkId;
    /**
     * 员工来源(1.外部,2.内部)
     */
@@ -367,6 +367,20 @@ public class StaffEntity extends StaffVo {
    public void setRemark(String remark){
        this.remark = remark;
    }
+    /**
+     * 获取 备注id
+     * @return String
+     */
+    public String getRemarkId(){
+        return remarkId;
+    }
+    /**
+     * 设置 备注id
+     * @param remarkId
+     */
+    public void setRemarkId(String remarkId){
+        this.remarkId = remarkId;
+    }
    /**
     * 获取 员工来源(1.外部,2.内部)
     * @return Integer
@@ -422,6 +436,7 @@ public class StaffEntity extends StaffVo {
        sb.append(",regularDate:").append(getRegularDate());
        sb.append(",leaveDate:").append(getLeaveDate());
        sb.append(",remark:").append(getRemark());
+        sb.append(",remarkId:").append(getRemarkId());
        sb.append(",source:").append(getSource());
        return sb.toString();
    }
@@ -466,6 +481,8 @@ public class StaffEntity extends StaffVo {

        this.remark = "";

+        this.remarkId = "";
+
        this.source = 1;
    }
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
 package com.mortals.xhx.module.staff.model;

-import java.util.Date;
 import java.util.List;
-import com.mortals.xhx.module.staff.model.StaffEntity;
 /**
 * 员工基本信息查询对象
 *
 * @author zxfei
- * @date 2023-04-08
+ * @date 2023-04-10
 */
 public class StaffQuery extends StaffEntity {
    /** 开始 序号，主键，自增长 */
@@ -226,6 +224,11 @@ public class StaffQuery extends StaffEntity {
    /** 结束 更新时间 */
    private String updateTimeEnd;

+    /** 备注id */
+    private List<String> remarkIdList;
+
+    /** 备注id排除列表 */
+    private List <String> remarkIdNotList;
    /** 开始 员工来源(1.外部,2.内部) */
    private Integer sourceStart;

@@ -1458,6 +1461,38 @@ public class StaffQuery extends StaffEntity {
        this.updateTimeEnd = updateTimeEnd;
    }

+    /**
+     * 获取 备注id
+     * @return remarkIdList
+     */
+    public List<String> getRemarkIdList(){
+        return this.remarkIdList;
+    }
+
+    /**
+     * 设置 备注id
+     * @param remarkIdList
+     */
+    public void setRemarkIdList(List<String> remarkIdList){
+        this.remarkIdList = remarkIdList;
+    }
+
+    /**
+     * 获取 备注id
+     * @return remarkIdNotList
+     */
+    public List<String> getRemarkIdNotList(){
+        return this.remarkIdNotList;
+    }
+
+    /**
+     * 设置 备注id
+     * @param remarkIdNotList
+     */
+    public void setRemarkIdNotList(List<String> remarkIdNotList){
+        this.remarkIdNotList = remarkIdNotList;
+    }
+
    /**
     * 获取 开始 员工来源(1.外部,2.内部)
     * @return sourceStart
@@ -2202,6 +2237,25 @@ public class StaffQuery extends StaffEntity {
    }


+
+    /**
+     * 设置 备注id
+     * @param remarkId
+     */
+    public StaffQuery remarkId(String remarkId){
+        setRemarkId(remarkId);
+        return this;
+    }
+
+    /**
+     * 设置 备注id
+     * @param remarkIdList
+     */
+    public StaffQuery remarkIdList(List<String> remarkIdList){
+        this.remarkIdList = remarkIdList;
+        return this;
+    }
+
    /**
     * 设置  员工来源(1.外部,2.内部)
     * @param source

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/HolidayListVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/HolidayListVo.java
+package com.mortals.xhx.module.staff.model.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author djx
+ * @date 2023年04月10日 14:20
+ */
+
+@Data
+public class HolidayListVo {
+    //姓名
+    private String workName;
+    //状态
+    private String workStatus;
+    //部门
+    private String workDept;
+    //在职期限
+    private String workLimit;
+    //入职时间
+    private Date workBeginDay;
+    //转正时间
+    private Date workFormalDay;
+    //本月实际出勤天数
+    private String attendanceCount;
+    //请假天数
+    private String leaveCount;
+    //迟到早退天数
+    private String lateCount;
+    //矿工天数
+    private String minerCount;
+    //缺卡次数
+    private String lackCardCount;
+    //加班天数
+    private String workOverDay;
+    //调休
+    private String compensatoryDay;
+    //婚假
+    private String marriageHoliday;
+    //年假
+    private String winterHoliday;
+    //陪产假
+    private String paternityLeaveDay;
+
+}
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java
 package com.mortals.xhx.module.staff.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.staff.model.StaffEntity;
 import lombok.Data;

-import java.util.ArrayList;
 import java.util.List;
 /**
 * 员工基本信息视图对象
@@ -16,4 +14,5 @@ public class StaffVo extends BaseEntityLong {

    private List <Long> idList;

+    private List<HolidayListVo> holidayLists;
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/holidayInfoVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/holidayInfoVo.java
+package com.mortals.xhx.module.staff.model.vo;
+
+import lombok.Data;
+
+@Data
+public class holidayInfoVo {
+
+    //调休
+    //private Integer
+
+}
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
 package com.mortals.xhx.module.staff.service;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 /**
@@ -9,6 +10,6 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
 * @author zxfei
 * @date 2023-04-07
 */
-public interface StaffService extends ICRUDService<StaffEntity,Long>{
+public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {

 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
 package com.mortals.xhx.module.staff.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,14 +8,20 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.staff.dao.StaffDao;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
+
 /**
-* StaffService
-* 员工基本信息 service实现
-*
-* @author zxfei
-* @date 2023-04-07
-*/
+ * StaffService
+ * 员工基本信息 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-07
+ */
 @Service("staffService")
-public class StaffServiceImpl extends AbstractCRUDServiceImpl<StaffDao, StaffEntity, Long> implements StaffService {
+public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, StaffEntity, Long> implements StaffService {

+    @Override
+    protected String getExtKey(StaffEntity data) {
+        //工号作为redis 扩展key
+        return data.getWorkNum();
+    }
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
 package com.mortals.xhx.module.staff.web;
+
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.StatusEnum;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.vo.HolidayListVo;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 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.staff.model.StaffEntity;
-import com.mortals.xhx.module.staff.service.StaffService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
+
+import java.util.ArrayList;
+import java.util.Date;
 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.*;
 /**
 *
 * 员工基本信息
@@ -61,4 +52,34 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
    protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
        return super.doListAfter(query, model, context);
    }
+
+
+    @Override
+    protected int infoAfter(Long id, Map<String, Object> model, StaffEntity entity, Context context) throws AppException {
+        //todo 员工统计信息
+        List<HolidayListVo> holidayListVos = new ArrayList<>();
+        HolidayListVo vo =new HolidayListVo();
+        vo.setWorkName("测试");
+        vo.setWorkStatus("正式");
+        vo.setWorkDept("技术部门");
+        vo.setWorkLimit("1003");
+        vo.setWorkBeginDay(new Date(2020-03-01));
+        vo.setWorkFormalDay(new Date(2020-04-31));
+        vo.setAttendanceCount("22");
+        vo.setLeaveCount("2");
+        vo.setLateCount("1");
+        vo.setMinerCount("1");
+        vo.setLackCardCount("0");
+        vo.setWorkOverDay("2");
+        vo.setCompensatoryDay("10");
+        vo.setMarriageHoliday("10");
+        vo.setWinterHoliday("10");
+        vo.setPaternityLeaveDay("10");
+        holidayListVos.add(vo);
+        entity.setHolidayLists(holidayListVos);
+
+       // StaffEntity cache = this.service.getCache(entity.getWorkNum());
+
+        return super.infoAfter(id, model, entity, context);
+    }
 }
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFixedworkDaoImpl">

    <!-- 字段和属性映射 -->

--- a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkSpecialMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkSpecialMapper.xml
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFreeworkDaoImpl">

    <!-- 字段和属性映射 -->

--- a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkSpecialMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkSpecialMapper.xml
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
@@ -29,6 +29,7 @@
        <result property="createTime" column="createTime" />
        <result property="updateUserId" column="updateUserId" />
        <result property="updateTime" column="updateTime" />
+        <result property="remarkId" column="remarkId" />
        <result property="source" column="source" />

    </resultMap>
@@ -109,6 +110,9 @@
            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                a.updateTime,
            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remarkId') or colPickMode == 1 and data.containsKey('remarkId')))">
+                a.remarkId,
+            </if>
            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
                a.source,
            </if>
@@ -117,18 +121,18 @@
    <!-- 新增 区分主键自增加还是业务插入 -->
    <insert id="insert" parameterType="StaffEntity"  useGeneratedKeys="true" keyProperty="id">
        insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,source)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source)
        VALUES
-        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{source})
+        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source})
    </insert>

    <!-- 批量新增 -->
    <insert id="insertBatch" parameterType="paramDto">
        insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,source)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source)
        VALUES
        <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.source})
+            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source})
        </foreach>
    </insert>

@@ -231,6 +235,9 @@
            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                a.updateTime=#{data.updateTime},
            </if>
+            <if test="(colPickMode==0 and data.containsKey('remarkId')) or (colPickMode==1 and !data.containsKey('remarkId'))">
+                a.remarkId=#{data.remarkId},
+            </if>
            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
                a.source=#{data.source},
            </if>
@@ -450,6 +457,13 @@
                    </if>
                </foreach>
            </trim>
+            <trim prefix="remarkId=(case" suffix="ELSE remarkId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remarkId')) or (colPickMode==1 and !item.containsKey('remarkId'))">
+                        when a.id=#{item.id} then #{item.remarkId}
+                    </if>
+                </foreach>
+            </trim>
            <trim prefix="source=(case" suffix="ELSE source end),">
                <foreach collection="data.dataList" item="item" index="index" separator="" >
                    <choose>
@@ -1100,6 +1114,27 @@
        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
        </if>
+
+        <if test="conditionParamRef.containsKey('remarkId')">
+            <if test="conditionParamRef.remarkId != null and conditionParamRef.remarkId != ''">
+                ${_conditionType_} a.remarkId like #{${_conditionParam_}.remarkId}
+            </if>
+            <if test="conditionParamRef.remarkId == null">
+                ${_conditionType_} a.remarkId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkIdList')">
+            ${_conditionType_} a.remarkId in
+            <foreach collection="conditionParamRef.remarkIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkIdNotList')">
+            ${_conditionType_} a.remarkId not in
+            <foreach collection="conditionParamRef.remarkIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
        <if test="conditionParamRef.containsKey('source')">
            <if test="conditionParamRef.source != null ">
                ${_conditionType_} a.source = #{${_conditionParam_}.source}
@@ -1260,6 +1295,11 @@
                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                    ,
                </if>
+                <if test="orderCol.containsKey('remarkId')">
+                    a.remarkId
+                    <if test='orderCol.remarkId != null and "DESC".equalsIgnoreCase(orderCol.remarkId)'>DESC</if>
+                    ,
+                </if>
                <if test="orderCol.containsKey('source')">
                    a.source
                    <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>

--- a/attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffController.http
+++ b/attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffController.http
@@ -56,10 +56,11 @@ client.global.set("Staff_id", JSON.parse(response.body).data.id);
 %}

 ###员工基本信息查看
-GET {{baseUrl}}/staff/info?id={{Staff_id}}
+GET {{baseUrl}}/staff/info?id=1
 Authorization: {{authToken}}
 Accept: application/json

+
 ###员工基本信息编辑
 GET {{baseUrl}}/staff/edit?id={{Staff_id}}
 Authorization: {{authToken}}

--- a/db/menu.sql
+++ b/db/menu.sql
@@ -14,9 +14,16 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '员工基本信息-菜单管
 -- ----------------------------
 INSERT INTO `mortals_xhx_param` VALUES (null, '性别', 'Staff', 'gender', '1', '男', 1, 4, 0, 'gender', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '性别', 'Staff', 'gender', '2', '女', 1, 4, 0, 'gender', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '政治面貌 ', 'Staff', 'politicalstatus', '1', '中共党员', 1, 4, 0, 'politicalstatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '政治面貌 ', 'Staff', 'politicalstatus', '2', '中共预备党员', 1, 4, 0, 'politicalstatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '政治面貌 ', 'Staff', 'politicalstatus', '3', '共青团员', 1, 4, 0, 'politicalstatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '政治面貌 ', 'Staff', 'politicalstatus', '4', '群众', 1, 4, 0, 'politicalstatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '政治面貌 ', 'Staff', 'politicalstatus', '5', '其它', 1, 4, 0, 'politicalstatus', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '员工状态', 'Staff', 'status', '1', '正式', 1, 4, 0, 'status', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '员工状态', 'Staff', 'status', '2', '试用', 1, 4, 0, 'status', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '员工状态', 'Staff', 'status', '3', '离职', 1, 4, 0, 'status', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '员工来源', 'Staff', 'source', '1', '外部', 1, 4, 0, 'source', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '员工来源', 'Staff', 'source', '2', '内部', 1, 4, 0, 'source', NULL, NULL, NULL);
 -- ----------------------------
 -- 员工关怀信息菜单 SQL
 -- ----------------------------

--- a/db/module.sql
+++ b/db/module.sql
@@ -50,12 +50,14 @@ CREATE TABLE mortals_xhx_staff(
                                  `createTime` datetime NOT NULL     COMMENT '创建时间',
                                  `updateUserId` bigint(20)      COMMENT '更新用户',
                                  `updateTime` datetime      COMMENT '更新时间',
+                                  `remarkId` varchar(255)      COMMENT '备注id',
                                  `source` tinyint(2)    DEFAULT '1'  COMMENT '员工来源(1.外部,2.内部)',
-PRIMARY KEY  (`id`)
+                                  PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息';



+
 -- ----------------------------
 -- 员工关怀信息表
 -- ----------------------------
@@ -569,16 +571,19 @@ CREATE TABLE mortals_xhx_attendance_group_freework_special(
    `className` varchar(128)      COMMENT '班次名称',
    `addWay` tinyint(1)    DEFAULT '0'  COMMENT '无需打卡的日期类型(0.单个日期,1.时间段)',
    `specialTime` datetime NOT NULL     COMMENT '特殊时间',
-    `specialTimeStart` datetime NOT NULL     COMMENT '时间段时候开始时间',
-    `specialTimeEnd` datetime NOT NULL     COMMENT '时间段结束时间',
+    `specialStartTime` datetime NOT NULL     COMMENT '时间段时候开始时间',
+    `specialEndTime` datetime NOT NULL     COMMENT '时间段结束时间',
    `remark` varchar(255)      COMMENT '备注',
    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
    `createTime` datetime NOT NULL     COMMENT '创建时间',
    `updateUserId` bigint(20)      COMMENT '更新用户',
    `updateTime` datetime      COMMENT '更新时间',
+
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤组考勤自由工时特殊日期配置';

+
+
 -- ----------------------------
 -- 考勤组考勤自由工时配置表
 -- ----------------------------
@@ -616,8 +621,8 @@ CREATE TABLE mortals_xhx_attendance_group_fixedwork_special(
    `className` varchar(128)      COMMENT '班次名称',
    `addWay` tinyint(1)    DEFAULT '0'  COMMENT '无需打卡的日期类型(0.单个日期,1.时间段)',
    `specialTime` datetime NOT NULL     COMMENT '特殊时间',
-    `specialTimeStart` datetime NOT NULL     COMMENT '时间段时候开始时间',
-    `specialTimeEnd` datetime NOT NULL     COMMENT '时间段结束时间',
+    `specialStartTime` datetime NOT NULL     COMMENT '时间段时候开始时间',
+    `specialEndTime` datetime NOT NULL     COMMENT '时间段结束时间',
    `remark` varchar(255)      COMMENT '备注',
    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
    `createTime` datetime NOT NULL     COMMENT '创建时间',
@@ -626,6 +631,8 @@ CREATE TABLE mortals_xhx_attendance_group_fixedwork_special(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤组考勤固定班制特殊日期配置';

+
+
 -- ----------------------------
 -- 考勤组考勤固定工时表
 -- ----------------------------

--- a/doc/api.md
+++ b/doc/api.md
@@ -8576,13 +8576,13 @@ data|object|数据对象
 &emsp;&emsp;className|String|班次名称
 &emsp;&emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;&emsp;specialTime|Date|特殊时间
-&emsp;&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;&emsp;remark|String|备注
 &emsp;&emsp;createUserId|Long|创建用户
 &emsp;&emsp;createTime|Date|创建时间
 &emsp;&emsp;updateUserId|Long|更新用户
 &emsp;&emsp;updateTime|Date|更新时间
+&emsp;&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;&emsp;specialEndTime|Date|时间段结束时间
 dict|object|字典对象
 &emsp;must|object|字典属性对象，详见附录
 &emsp;addWay|object|字典属性对象，详见附录
@@ -8630,13 +8630,13 @@ data|object|数据对象
 &emsp;className|String|班次名称
 &emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;specialTime|Date|特殊时间
-&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;remark|String|备注
 &emsp;createUserId|Long|创建用户
 &emsp;createTime|Date|创建时间
 &emsp;updateUserId|Long|更新用户
 &emsp;updateTime|Date|更新时间
+&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;specialEndTime|Date|时间段结束时间
 dict|object|字典对象
 &emsp;must|object|字典属性对象，详见附录
 &emsp;addWay|object|字典属性对象，详见附录
@@ -8646,20 +8646,20 @@ dict|object|字典对象
 {
    "code": 1,
    "data": {
-            "id":5248,
-            "freeWorkId":9666,
-            "must":3613,
-            "classId":2609,
-            "className":"ngw8u1",
-            "addWay":6162,
-            "specialTime":"2023-04-08",
-            "specialTimeStart":"2023-04-08",
-            "specialTimeEnd":"2023-04-08",
-            "remark":"jz8f50",
-            "createUserId":5403,
-            "createTime":"2023-04-08",
-            "updateUserId":5469,
-            "updateTime":"2023-04-08"
+            "id":5076,
+            "freeWorkId":7022,
+            "must":2824,
+            "classId":1549,
+            "className":"nddun6",
+            "addWay":9326,
+            "specialTime":"2023-04-10",
+            "remark":"gfccxk",
+            "createUserId":1207,
+            "createTime":"2023-04-10",
+            "updateUserId":480,
+            "updateTime":"2023-04-10",
+            "specialStartTime":"2023-04-10",
+            "specialEndTime":"2023-04-10"
        }
 }
 ```
@@ -8684,22 +8684,22 @@ classId|Long|否|班次ID
 className|String|否|班次名称
 addWay|Integer|否|无需打卡的日期类型(0.单个日期,1.时间段)
 specialTime|Date|是|特殊时间
-specialTimeStart|Date|是|时间段时候开始时间
-specialTimeEnd|Date|是|时间段结束时间
 remark|String|否|备注
+specialStartTime|Date|是|时间段时候开始时间
+specialEndTime|Date|是|时间段结束时间

 **请求样例:**
 ```
 {
-    "freeWorkId":1675,
-    "must":5147,
-    "classId":7952,
-    "className":"e0jfo6",
-    "addWay":2694,
-    "specialTime":"2023-04-08",
-    "specialTimeStart":"2023-04-08",
-    "specialTimeEnd":"2023-04-08",
-    "remark":"9tfxpf",
+    "freeWorkId":6139,
+    "must":8249,
+    "classId":2953,
+    "className":"oh2and",
+    "addWay":82,
+    "specialTime":"2023-04-10",
+    "remark":"ypalu8",
+    "specialStartTime":"2023-04-10",
+    "specialEndTime":"2023-04-10"
 }

 ```
@@ -8719,13 +8719,13 @@ data|object|数据对象
 &emsp;&emsp;className|String|班次名称
 &emsp;&emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;&emsp;specialTime|Date|特殊时间
-&emsp;&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;&emsp;remark|String|备注
 &emsp;&emsp;createUserId|Long|创建用户
 &emsp;&emsp;createTime|Date|创建时间
 &emsp;&emsp;updateUserId|Long|更新用户
 &emsp;&emsp;updateTime|Date|更新时间
+&emsp;&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;&emsp;specialEndTime|Date|时间段结束时间

 **响应消息样例:**
 ```
@@ -9092,13 +9092,13 @@ data|object|数据对象
 &emsp;&emsp;className|String|班次名称
 &emsp;&emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;&emsp;specialTime|Date|特殊时间
-&emsp;&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;&emsp;remark|String|备注
 &emsp;&emsp;createUserId|Long|创建用户
 &emsp;&emsp;createTime|Date|创建时间
 &emsp;&emsp;updateUserId|Long|更新用户
 &emsp;&emsp;updateTime|Date|更新时间
+&emsp;&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;&emsp;specialEndTime|Date|时间段结束时间
 dict|object|字典对象
 &emsp;must|object|字典属性对象，详见附录
 &emsp;addWay|object|字典属性对象，详见附录
@@ -9146,13 +9146,13 @@ data|object|数据对象
 &emsp;className|String|班次名称
 &emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;specialTime|Date|特殊时间
-&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;remark|String|备注
 &emsp;createUserId|Long|创建用户
 &emsp;createTime|Date|创建时间
 &emsp;updateUserId|Long|更新用户
 &emsp;updateTime|Date|更新时间
+&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;specialEndTime|Date|时间段结束时间
 dict|object|字典对象
 &emsp;must|object|字典属性对象，详见附录
 &emsp;addWay|object|字典属性对象，详见附录
@@ -9162,20 +9162,20 @@ dict|object|字典对象
 {
    "code": 1,
    "data": {
-            "id":8015,
-            "fixedWorkId":2972,
-            "must":3802,
-            "classId":5674,
-            "className":"53zlul",
-            "addWay":4124,
-            "specialTime":"2023-04-08",
-            "specialTimeStart":"2023-04-08",
-            "specialTimeEnd":"2023-04-08",
-            "remark":"0rfxq5",
-            "createUserId":8082,
-            "createTime":"2023-04-08",
-            "updateUserId":2828,
-            "updateTime":"2023-04-08"
+            "id":7924,
+            "fixedWorkId":1115,
+            "must":8070,
+            "classId":8139,
+            "className":"3c4hgu",
+            "addWay":1203,
+            "specialTime":"2023-04-10",
+            "remark":"w614hb",
+            "createUserId":4288,
+            "createTime":"2023-04-10",
+            "updateUserId":6736,
+            "updateTime":"2023-04-10",
+            "specialStartTime":"2023-04-10",
+            "specialEndTime":"2023-04-10"
        }
 }
 ```
@@ -9200,22 +9200,22 @@ classId|Long|否|班次ID
 className|String|否|班次名称
 addWay|Integer|否|无需打卡的日期类型(0.单个日期,1.时间段)
 specialTime|Date|是|特殊时间
-specialTimeStart|Date|是|时间段时候开始时间
-specialTimeEnd|Date|是|时间段结束时间
 remark|String|否|备注
+specialStartTime|Date|是|时间段时候开始时间
+specialEndTime|Date|是|时间段结束时间

 **请求样例:**
 ```
 {
-    "fixedWorkId":8982,
-    "must":7809,
-    "classId":1902,
-    "className":"72xrq3",
-    "addWay":6684,
-    "specialTime":"2023-04-08",
-    "specialTimeStart":"2023-04-08",
-    "specialTimeEnd":"2023-04-08",
-    "remark":"th3m5f",
+    "fixedWorkId":9498,
+    "must":2219,
+    "classId":5994,
+    "className":"0a7u6p",
+    "addWay":3443,
+    "specialTime":"2023-04-10",
+    "remark":"takndm",
+    "specialStartTime":"2023-04-10",
+    "specialEndTime":"2023-04-10"
 }

 ```
@@ -9235,13 +9235,13 @@ data|object|数据对象
 &emsp;&emsp;className|String|班次名称
 &emsp;&emsp;addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
 &emsp;&emsp;specialTime|Date|特殊时间
-&emsp;&emsp;specialTimeStart|Date|时间段时候开始时间
-&emsp;&emsp;specialTimeEnd|Date|时间段结束时间
 &emsp;&emsp;remark|String|备注
 &emsp;&emsp;createUserId|Long|创建用户
 &emsp;&emsp;createTime|Date|创建时间
 &emsp;&emsp;updateUserId|Long|更新用户
 &emsp;&emsp;updateTime|Date|更新时间
+&emsp;&emsp;specialStartTime|Date|时间段时候开始时间
+&emsp;&emsp;specialEndTime|Date|时间段结束时间

 **响应消息样例:**
 ```

--- a/doc/考勤绩效管理系统.docx
+++ b/doc/考勤绩效管理系统.docx