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

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

 <template>
-    <div  class="page">
-111
+    <div class="page">
+        <div class="top">
+            <el-tabs v-model="tabs">
+                <el-tab-pane label="设计问卷" name="1">
+                    <iframe style="width: 100%;height: 80vh;" src="https://wurong19870715.gitee.io/formdesigner/#/" frameborder="0"></iframe>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
     </div>
 </template>
 
 <script>
 export default {
-
+    data() {
+        return {
+            tabs: '1'
+        }
+    }
 }
 </script>
 
 <style lang="less" scoped>
+.top {}
 </style>
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import java.util.List;
+/**
+* 员工反馈问卷Dao
+* 员工反馈问卷 DAO接口
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+
+public interface  FeedbackStaffDao extends ICRUDDao<FeedbackStaffEntity,Long>{
+
+
+}

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

+package com.mortals.xhx.module.feedback.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.feedback.dao.FeedbackStaffDao;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 员工反馈问卷DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+@Repository("feedbackStaffDao")
+public class FeedbackStaffDaoImpl extends BaseCRUDDaoMybatis<FeedbackStaffEntity,Long> implements FeedbackStaffDao {
+
+
+
+}

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

+package com.mortals.xhx.module.feedback.model;
+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.feedback.model.vo.FeedbackStaffVo;
+import lombok.Data;
+/**
+* 员工反馈问卷实体对象
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+@Data
+public class FeedbackStaffEntity extends FeedbackStaffVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 反馈问卷id号
+    */
+    private Long feedbackId;
+    /**
+    * 用户id
+    */
+    private Long staffId;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof FeedbackStaffEntity) {
+            FeedbackStaffEntity tmp = (FeedbackStaffEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.feedbackId = 0L;
+
+            this.staffId = 0L;
+
+            this.remark = "";
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.model;
+
+import java.util.List;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+/**
+* 员工反馈问卷查询对象
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+public class FeedbackStaffQuery extends FeedbackStaffEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 反馈问卷id号 */
+    private Long feedbackIdStart;
+
+    /** 结束 反馈问卷id号 */
+    private Long feedbackIdEnd;
+
+    /** 增加 反馈问卷id号 */
+    private Long feedbackIdIncrement;
+
+    /** 反馈问卷id号列表 */
+    private List <Long> feedbackIdList;
+
+    /** 反馈问卷id号排除列表 */
+    private List <Long> feedbackIdNotList;
+
+    /** 开始 用户id */
+    private Long staffIdStart;
+
+    /** 结束 用户id */
+    private Long staffIdEnd;
+
+    /** 增加 用户id */
+    private Long staffIdIncrement;
+
+    /** 用户id列表 */
+    private List <Long> staffIdList;
+
+    /** 用户id排除列表 */
+    private List <Long> staffIdNotList;
+
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<FeedbackStaffQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<FeedbackStaffQuery> andConditionList;
+
+    public FeedbackStaffQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 反馈问卷id号
+    * @return feedbackIdStart
+    */
+    public Long getFeedbackIdStart(){
+        return this.feedbackIdStart;
+    }
+
+    /**
+    * 设置 开始 反馈问卷id号
+    * @param feedbackIdStart
+    */
+    public void setFeedbackIdStart(Long feedbackIdStart){
+        this.feedbackIdStart = feedbackIdStart;
+    }
+
+    /**
+    * 获取 结束 反馈问卷id号
+    * @return $feedbackIdEnd
+    */
+    public Long getFeedbackIdEnd(){
+        return this.feedbackIdEnd;
+    }
+
+    /**
+    * 设置 结束 反馈问卷id号
+    * @param feedbackIdEnd
+    */
+    public void setFeedbackIdEnd(Long feedbackIdEnd){
+        this.feedbackIdEnd = feedbackIdEnd;
+    }
+
+    /**
+    * 获取 增加 反馈问卷id号
+    * @return feedbackIdIncrement
+    */
+    public Long getFeedbackIdIncrement(){
+        return this.feedbackIdIncrement;
+    }
+
+    /**
+    * 设置 增加 反馈问卷id号
+    * @param feedbackIdIncrement
+    */
+    public void setFeedbackIdIncrement(Long feedbackIdIncrement){
+        this.feedbackIdIncrement = feedbackIdIncrement;
+    }
+
+    /**
+    * 获取 反馈问卷id号
+    * @return feedbackIdList
+    */
+    public List<Long> getFeedbackIdList(){
+        return this.feedbackIdList;
+    }
+
+    /**
+    * 设置 反馈问卷id号
+    * @param feedbackIdList
+    */
+    public void setFeedbackIdList(List<Long> feedbackIdList){
+        this.feedbackIdList = feedbackIdList;
+    }
+
+    /**
+    * 获取 反馈问卷id号
+    * @return feedbackIdNotList
+    */
+    public List<Long> getFeedbackIdNotList(){
+        return this.feedbackIdNotList;
+    }
+
+    /**
+    * 设置 反馈问卷id号
+    * @param feedbackIdNotList
+    */
+    public void setFeedbackIdNotList(List<Long> feedbackIdNotList){
+        this.feedbackIdNotList = feedbackIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 用户id
+    * @return staffIdStart
+    */
+    public Long getStaffIdStart(){
+        return this.staffIdStart;
+    }
+
+    /**
+    * 设置 开始 用户id
+    * @param staffIdStart
+    */
+    public void setStaffIdStart(Long staffIdStart){
+        this.staffIdStart = staffIdStart;
+    }
+
+    /**
+    * 获取 结束 用户id
+    * @return $staffIdEnd
+    */
+    public Long getStaffIdEnd(){
+        return this.staffIdEnd;
+    }
+
+    /**
+    * 设置 结束 用户id
+    * @param staffIdEnd
+    */
+    public void setStaffIdEnd(Long staffIdEnd){
+        this.staffIdEnd = staffIdEnd;
+    }
+
+    /**
+    * 获取 增加 用户id
+    * @return staffIdIncrement
+    */
+    public Long getStaffIdIncrement(){
+        return this.staffIdIncrement;
+    }
+
+    /**
+    * 设置 增加 用户id
+    * @param staffIdIncrement
+    */
+    public void setStaffIdIncrement(Long staffIdIncrement){
+        this.staffIdIncrement = staffIdIncrement;
+    }
+
+    /**
+    * 获取 用户id
+    * @return staffIdList
+    */
+    public List<Long> getStaffIdList(){
+        return this.staffIdList;
+    }
+
+    /**
+    * 设置 用户id
+    * @param staffIdList
+    */
+    public void setStaffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
+    }
+
+    /**
+    * 获取 用户id
+    * @return staffIdNotList
+    */
+    public List<Long> getStaffIdNotList(){
+        return this.staffIdNotList;
+    }
+
+    /**
+    * 设置 用户id
+    * @param staffIdNotList
+    */
+    public void setStaffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public FeedbackStaffQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public FeedbackStaffQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public FeedbackStaffQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public FeedbackStaffQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public FeedbackStaffQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public FeedbackStaffQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  反馈问卷id号
+    * @param feedbackId
+    */
+    public FeedbackStaffQuery feedbackId(Long feedbackId){
+	    setFeedbackId(feedbackId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 反馈问卷id号
+    * @param feedbackIdStart
+    */
+    public FeedbackStaffQuery feedbackIdStart(Long feedbackIdStart){
+		this.feedbackIdStart = feedbackIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 反馈问卷id号
+    * @param feedbackIdEnd
+    */
+    public FeedbackStaffQuery feedbackIdEnd(Long feedbackIdEnd){
+		this.feedbackIdEnd = feedbackIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 反馈问卷id号
+    * @param feedbackIdIncrement
+    */
+    public FeedbackStaffQuery feedbackIdIncrement(Long feedbackIdIncrement){
+		this.feedbackIdIncrement = feedbackIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 反馈问卷id号
+    * @param feedbackIdList
+    */
+    public FeedbackStaffQuery feedbackIdList(List<Long> feedbackIdList){
+        this.feedbackIdList = feedbackIdList;
+		return this;
+        }
+
+        /**
+        * 设置 反馈问卷id号
+        * @param feedbackIdNotList
+        */
+        public FeedbackStaffQuery feedbackIdNotList(List<Long> feedbackIdNotList){
+        this.feedbackIdNotList = feedbackIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  用户id
+    * @param staffId
+    */
+    public FeedbackStaffQuery staffId(Long staffId){
+	    setStaffId(staffId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 用户id
+    * @param staffIdStart
+    */
+    public FeedbackStaffQuery staffIdStart(Long staffIdStart){
+		this.staffIdStart = staffIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 用户id
+    * @param staffIdEnd
+    */
+    public FeedbackStaffQuery staffIdEnd(Long staffIdEnd){
+		this.staffIdEnd = staffIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 用户id
+    * @param staffIdIncrement
+    */
+    public FeedbackStaffQuery staffIdIncrement(Long staffIdIncrement){
+		this.staffIdIncrement = staffIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 用户id
+    * @param staffIdList
+    */
+    public FeedbackStaffQuery staffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
+		return this;
+        }
+
+        /**
+        * 设置 用户id
+        * @param staffIdNotList
+        */
+        public FeedbackStaffQuery staffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public FeedbackStaffQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public FeedbackStaffQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public FeedbackStaffQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public FeedbackStaffQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public FeedbackStaffQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public FeedbackStaffQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public FeedbackStaffQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public FeedbackStaffQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public FeedbackStaffQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public FeedbackStaffQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public FeedbackStaffQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public FeedbackStaffQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public FeedbackStaffQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public FeedbackStaffQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<FeedbackStaffQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<FeedbackStaffQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<FeedbackStaffQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<FeedbackStaffQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 员工反馈问卷视图对象
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+@Data
+public class FeedbackStaffVo extends BaseEntityLong {
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import com.mortals.xhx.module.feedback.dao.FeedbackStaffDao;
+/**
+* FeedbackStaffService
+*
+* 员工反馈问卷 service接口
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+public interface FeedbackStaffService extends ICRUDService<FeedbackStaffEntity,Long>{
+
+    FeedbackStaffDao getDao();
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.feedback.dao.FeedbackStaffDao;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import com.mortals.xhx.module.feedback.service.FeedbackStaffService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* FeedbackStaffService
+* 员工反馈问卷 service实现
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+@Service("feedbackStaffService")
+@Slf4j
+public class FeedbackStaffServiceImpl extends AbstractCRUDServiceImpl<FeedbackStaffDao, FeedbackStaffEntity, Long> implements FeedbackStaffService {
+    
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.feedback.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+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.feedback.model.FeedbackStaffEntity;
+import com.mortals.xhx.module.feedback.service.FeedbackStaffService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 员工反馈问卷
+*
+* @author zxfei
+* @date 2023-07-06
+*/
+@RestController
+@RequestMapping("feedback/staff")
+public class FeedbackStaffController extends BaseCRUDJsonBodyMappingController<FeedbackStaffService,FeedbackStaffEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public FeedbackStaffController(){
+        super.setModuleDesc( "员工反馈问卷");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.feedback.dao.ibatis.FeedbackStaffDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="FeedbackStaffEntity" id="FeedbackStaffEntity-Map">
+            <id  property="id" column="id" />
+            <result property="feedbackId" column="feedbackId" />
+            <result property="staffId" column="staffId" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackId') or colPickMode == 1 and data.containsKey('feedbackId')))">
+                    a.feedbackId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
+                    a.staffId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="FeedbackStaffEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_feedback_staff
+        (feedbackId,staffId,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{feedbackId},#{staffId},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_feedback_staff
+        (feedbackId,staffId,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.feedbackId},#{item.staffId},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_feedback_staff as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('feedbackId')) or (colPickMode==1 and !data.containsKey('feedbackId'))">
+                a.feedbackId=#{data.feedbackId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('feedbackIdIncrement')) or (colPickMode==1 and !data.containsKey('feedbackIdIncrement'))">
+                a.feedbackId=ifnull(a.feedbackId,0) + #{data.feedbackIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))">
+                a.staffId=#{data.staffId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))">
+                a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_feedback_staff as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="feedbackId=(case" suffix="ELSE feedbackId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('feedbackId')) or (colPickMode==1 and !item.containsKey('feedbackId'))">
+                                        when a.id=#{item.id} then #{item.feedbackId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('feedbackIdIncrement')) or (colPickMode==1 and !item.containsKey('feedbackIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.feedbackId,0) + #{item.feedbackIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="staffId=(case" suffix="ELSE staffId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
+                                        when a.id=#{item.id} then #{item.staffId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="FeedbackStaffEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_feedback_staff as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_feedback_staff as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_feedback_staff where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_feedback_staff where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_feedback_staff where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_feedback_staff as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="FeedbackStaffEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_feedback_staff as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_feedback_staff as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('feedbackId')">
+                <if test="conditionParamRef.feedbackId != null ">
+                    ${_conditionType_} a.feedbackId = #{${_conditionParam_}.feedbackId}
+                </if>
+                <if test="conditionParamRef.feedbackId == null">
+                    ${_conditionType_} a.feedbackId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('feedbackIdList') and conditionParamRef.feedbackIdList.size() > 0">
+                ${_conditionType_} a.feedbackId in
+                <foreach collection="conditionParamRef.feedbackIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('feedbackIdNotList') and conditionParamRef.feedbackIdNotList.size() > 0">
+                ${_conditionType_} a.feedbackId not in
+                <foreach collection="conditionParamRef.feedbackIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('feedbackIdStart') and conditionParamRef.feedbackIdStart != null">
+                ${_conditionType_} a.feedbackId <![CDATA[ >= ]]> #{${_conditionParam_}.feedbackIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('feedbackIdEnd') and conditionParamRef.feedbackIdEnd != null">
+                ${_conditionType_} a.feedbackId <![CDATA[ <= ]]> #{${_conditionParam_}.feedbackIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('staffId')">
+                <if test="conditionParamRef.staffId != null ">
+                    ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
+                </if>
+                <if test="conditionParamRef.staffId == null">
+                    ${_conditionType_} a.staffId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+                ${_conditionType_} a.staffId in
+                <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
+                ${_conditionType_} a.staffId not in
+                <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
+                ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
+                ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <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>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('feedbackId')">
+                        a.feedbackId
+                        <if test='orderCol.feedbackId != null and "DESC".equalsIgnoreCase(orderCol.feedbackId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('staffId')">
+                        a.staffId
+                        <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

attendance-performance-manager/src/test/java/com/mortals/httpclient/feedback/FeedbackStaffController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###员工反馈问卷列表
+POST {{baseUrl}}/feedback/staff/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###员工反馈问卷更新与保存
+POST {{baseUrl}}/feedback/staff/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "feedbackId":0,
+        "staffId":0,
+        "remark":"9ibjqk",
+}
+
+> {%
+client.global.set("FeedbackStaff_id", JSON.parse(response.body).data.id);
+%}
+
+###员工反馈问卷查看
+GET {{baseUrl}}/feedback/staff/info?id={{FeedbackStaff_id}}
+Accept: application/json
+
+###员工反馈问卷编辑
+GET {{baseUrl}}/feedback/staff/edit?id={{FeedbackStaff_id}}
+Accept: application/json
+
+
+###员工反馈问卷删除
+GET {{baseUrl}}/feedback/staff/delete?id={{FeedbackStaff_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

db/add.sql

@@ -250,4 +250,29 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '绩效问题回答选项-菜
 -- 员工绩效统计资源路径 SQL
 -- ----------------------------
 INSERT INTO `mortals_xhx_resource` VALUES (null, '员工绩效统计-菜单管理-查看', '/staff/perform/summary/list,/staff/perform/summary/view,/staff/perform/summary/info,/staff/perform/summary/export,/staff/perform/summary/exportExcel,/staff/perform/summary/downloadTemplate,/staff/perform/summary/download', 3, 0, NULL, NULL, NULL, 0);
-INSERT INTO `mortals_xhx_resource` VALUES (null, '员工绩效统计-菜单管理-维护', '/staff/perform/summary/add,/staff/perform/summary/edit,/staff/perform/summary/delete,/staff/perform/summary/logicDelete,/staff/perform/summary/save,/staff/perform/summary/importData', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '员工绩效统计-菜单管理-维护', '/staff/perform/summary/add,/staff/perform/summary/edit,/staff/perform/summary/delete,/staff/perform/summary/logicDelete,/staff/perform/summary/save,/staff/perform/summary/importData', 3, 0, NULL, NULL, NULL, 0);
\ No newline at end of file
+
+
+
+-- ----------------------------
+-- 员工反馈问卷表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_feedback_staff`;
+CREATE TABLE mortals_xhx_feedback_staff(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `feedbackId` bigint(20)    DEFAULT '0'  COMMENT '反馈问卷id号',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '用户id',
+    `remark` varchar(255)      COMMENT '备注',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `createTime` datetime      COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工反馈问卷';
+
+
+-- ----------------------------
+-- 员工反馈问卷资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0);