添加用户反馈问答表

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

@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
 import lombok.Data;
 /**
-* 考勤绩效记录核查信息实体对象
-*
-* @author zxfei
-* @date 2023-05-18
-*/
+ * 考勤绩效记录核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     private static final long serialVersionUID = 1L;
@@ -89,6 +89,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     /**
      * 核查人员
      */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
      * 核查时间
@@ -97,15 +98,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     /**
      * 核查说明
      */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
      * 核查结果
      */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
      * 处理状态(1.未处理,2.已处理)
      */
     private Integer checkStatus;
+    /**
+     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     */
+    private Integer subMethod;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -167,5 +174,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
         this.checkResult = "";
 
         this.checkStatus = 1;
+
+        this.subMethod = 1;
     }
 }
\ No newline at end of file

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

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 /**
-* 考勤绩效记录核查信息查询对象
-*
-* @author zxfei
-* @date 2023-05-18
-*/
+ * 考勤绩效记录核查信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -262,6 +262,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) */
+    private Integer subMethodStart;
+
+    /** 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) */
+    private Integer subMethodEnd;
+
+    /** 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) */
+    private Integer subMethodIncrement;
+
+    /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)列表 */
+    private List <Integer> subMethodList;
+
+    /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */
+    private List <Integer> subMethodNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckAttendRecordQuery> orConditionList;
 
@@ -1673,6 +1688,87 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @return subMethodStart
+     */
+    public Integer getSubMethodStart(){
+        return this.subMethodStart;
+    }
+
+    /**
+     * 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodStart
+     */
+    public void setSubMethodStart(Integer subMethodStart){
+        this.subMethodStart = subMethodStart;
+    }
+
+    /**
+     * 获取 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @return $subMethodEnd
+     */
+    public Integer getSubMethodEnd(){
+        return this.subMethodEnd;
+    }
+
+    /**
+     * 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodEnd
+     */
+    public void setSubMethodEnd(Integer subMethodEnd){
+        this.subMethodEnd = subMethodEnd;
+    }
+
+    /**
+     * 获取 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @return subMethodIncrement
+     */
+    public Integer getSubMethodIncrement(){
+        return this.subMethodIncrement;
+    }
+
+    /**
+     * 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodIncrement
+     */
+    public void setSubMethodIncrement(Integer subMethodIncrement){
+        this.subMethodIncrement = subMethodIncrement;
+    }
+
+    /**
+     * 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @return subMethodList
+     */
+    public List<Integer> getSubMethodList(){
+        return this.subMethodList;
+    }
+
+    /**
+     * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodList
+     */
+    public void setSubMethodList(List<Integer> subMethodList){
+        this.subMethodList = subMethodList;
+    }
+
+    /**
+     * 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @return subMethodNotList
+     */
+    public List<Integer> getSubMethodNotList(){
+        return this.subMethodNotList;
+    }
+
+    /**
+     * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodNotList
+     */
+    public void setSubMethodNotList(List<Integer> subMethodNotList){
+        this.subMethodNotList = subMethodNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2463,6 +2559,60 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
 
+    /**
+     * 设置  扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethod
+     */
+    public CheckAttendRecordQuery subMethod(Integer subMethod){
+        setSubMethod(subMethod);
+        return this;
+    }
+
+    /**
+     * 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodStart
+     */
+    public CheckAttendRecordQuery subMethodStart(Integer subMethodStart){
+        this.subMethodStart = subMethodStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodEnd
+     */
+    public CheckAttendRecordQuery subMethodEnd(Integer subMethodEnd){
+        this.subMethodEnd = subMethodEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodIncrement
+     */
+    public CheckAttendRecordQuery subMethodIncrement(Integer subMethodIncrement){
+        this.subMethodIncrement = subMethodIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodList
+     */
+    public CheckAttendRecordQuery subMethodList(List<Integer> subMethodList){
+        this.subMethodList = subMethodList;
+        return this;
+    }
+
+    /**
+     * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     * @param subMethodNotList
+     */
+    public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){
+        this.subMethodNotList = subMethodNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

@@ -10,11 +10,11 @@ import com.mortals.xhx.module.feedback.model.vo.FeedbackVo;
 import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
 import lombok.Data;
 /**
-* 绩效反馈记录信息实体对象
-*
-* @author zxfei
-* @date 2023-07-05
-*/
+ * 绩效反馈记录信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @Data
 public class FeedbackEntity extends FeedbackVo {
     private static final long serialVersionUID = 1L;
@@ -55,6 +55,10 @@ public class FeedbackEntity extends FeedbackVo {
      * 备注说明
      */
     private String remark;
+    /**
+     * 表单内容
+     */
+    private String formContent;
     /**
      * 绩效反馈问题信息
      */
@@ -101,5 +105,7 @@ public class FeedbackEntity extends FeedbackVo {
         this.webUrl = "";
 
         this.remark = "";
+
+        this.formContent = "";
     }
 }
\ No newline at end of file

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

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 /**
-* 绩效反馈记录信息查询对象
-*
-* @author zxfei
-* @date 2023-07-05
-*/
+ * 绩效反馈记录信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 public class FeedbackQuery extends FeedbackEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -155,6 +155,11 @@ public class FeedbackQuery extends FeedbackEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 表单内容 */
+    private List<String> formContentList;
+
+    /** 表单内容排除列表 */
+    private List <String> formContentNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<FeedbackQuery> orConditionList;
 
@@ -954,6 +959,38 @@ public class FeedbackQuery extends FeedbackEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 表单内容
+     * @return formContentList
+     */
+    public List<String> getFormContentList(){
+        return this.formContentList;
+    }
+
+    /**
+     * 设置 表单内容
+     * @param formContentList
+     */
+    public void setFormContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+    }
+
+    /**
+     * 获取 表单内容
+     * @return formContentNotList
+     */
+    public List<String> getFormContentNotList(){
+        return this.formContentNotList;
+    }
+
+    /**
+     * 设置 表单内容
+     * @param formContentNotList
+     */
+    public void setFormContentNotList(List<String> formContentNotList){
+        this.formContentNotList = formContentNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1393,6 +1430,25 @@ public class FeedbackQuery extends FeedbackEntity {
     }
 
 
+
+    /**
+     * 设置 表单内容
+     * @param formContent
+     */
+    public FeedbackQuery formContent(String formContent){
+        setFormContent(formContent);
+        return this;
+    }
+
+    /**
+     * 设置 表单内容
+     * @param formContentList
+     */
+    public FeedbackQuery formContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.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.check.dao.ibatis.CheckAttendRecordDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -32,6 +32,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="subMethod" column="subMethod" />
 
     </resultMap>
 
@@ -120,23 +121,26 @@
             <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('subMethod') or colPickMode == 1 and data.containsKey('subMethod')))">
+                a.subMethod,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckAttendRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod})
         </foreach>
     </insert>
 
@@ -254,6 +258,12 @@
             <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('subMethod')) or (colPickMode==1 and !data.containsKey('subMethod'))">
+                a.subMethod=#{data.subMethod},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subMethodIncrement')) or (colPickMode==1 and !data.containsKey('subMethodIncrement'))">
+                a.subMethod=ifnull(a.subMethod,0) + #{data.subMethodIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -498,6 +508,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="subMethod=(case" suffix="ELSE subMethod end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('subMethod')) or (colPickMode==1 and !item.containsKey('subMethod'))">
+                            when a.id=#{item.id} then #{item.subMethod}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('subMethodIncrement')) or (colPickMode==1 and !item.containsKey('subMethodIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.subMethod,0) + #{item.subMethodIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1211,6 +1233,33 @@
         <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('subMethod')">
+            <if test="conditionParamRef.subMethod != null ">
+                ${_conditionType_} a.subMethod = #{${_conditionParam_}.subMethod}
+            </if>
+            <if test="conditionParamRef.subMethod == null">
+                ${_conditionType_} a.subMethod is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodList') and conditionParamRef.subMethodList.size() > 0">
+            ${_conditionType_} a.subMethod in
+            <foreach collection="conditionParamRef.subMethodList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodNotList') and conditionParamRef.subMethodNotList.size() > 0">
+            ${_conditionType_} a.subMethod not in
+            <foreach collection="conditionParamRef.subMethodNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodStart') and conditionParamRef.subMethodStart != null">
+            ${_conditionType_} a.subMethod <![CDATA[ >= ]]> #{${_conditionParam_}.subMethodStart}
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodEnd') and conditionParamRef.subMethodEnd != null">
+            ${_conditionType_} a.subMethod <![CDATA[ <= ]]> #{${_conditionParam_}.subMethodEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1359,6 +1408,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('subMethod')">
+                    a.subMethod
+                    <if test='orderCol.subMethod != null and "DESC".equalsIgnoreCase(orderCol.subMethod)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapper.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.feedback.dao.ibatis.FeedbackDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -19,6 +19,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="formContent" column="formContent" />
         <collection property="feedbackQuestionList" column="id" ofType="FeedbackQuestionEntity" javaType="ArrayList" select="getFeedbackQuestionByFeedbackId"></collection>
     </resultMap>
     <resultMap type="FeedbackQuestionEntity" id="FeedbackQuestionEntity-Map">
@@ -81,6 +82,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('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
+                a.formContent,
+            </if>
         </trim>
     </sql>
     <!-- 子表所有列 -->
@@ -92,18 +96,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="FeedbackEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_feedback
-        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime)
+        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent)
         VALUES
-        (#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{formContent})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_feedback
-        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime)
+        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.formContent})
         </foreach>
     </insert>
 
@@ -170,6 +174,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('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
+                a.formContent=#{data.formContent},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -303,6 +310,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="formContent=(case" suffix="ELSE formContent end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
+                        when a.id=#{item.id} then #{item.formContent}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -739,6 +753,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('formContent')">
+            <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
+                ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
+            </if>
+            <if test="conditionParamRef.formContent == null">
+                ${_conditionType_} a.formContent is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
+            ${_conditionType_} a.formContent in
+            <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
+            ${_conditionType_} a.formContent not in
+            <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -822,6 +857,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('formContent')">
+                    a.formContent
+                    <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

db/add.sql

@@ -74,6 +74,7 @@ CREATE TABLE mortals_xhx_feedback(
     `processStatus` tinyint(2)    DEFAULT '0'  COMMENT '状态 (0.未开始,1.进行中,2.已结束)',
     `weblink` tinyint(2)    DEFAULT '0'  COMMENT '问卷是否外链(0.否,1.是)',
     `webUrl` varchar(255)      COMMENT '问题外链地址',
+    `formContent` mediumtext      COMMENT '表单内容',
     `remark` varchar(255)      COMMENT '备注说明',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `createTime` datetime      COMMENT '创建时间',
@@ -81,6 +82,7 @@ CREATE TABLE mortals_xhx_feedback(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效反馈记录信息';
+
 -- ----------------------------
 -- 绩效反馈问题表
 -- ----------------------------

db/module.sql

@@ -1484,6 +1484,7 @@ CREATE TABLE mortals_xhx_perform_review_record(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='评价差评绩效记录信息';
+
 -- ----------------------------
 -- 考勤绩效记录核查信息表
 -- ----------------------------
@@ -1516,8 +1517,10 @@ CREATE TABLE mortals_xhx_check_attend_record(
     `createTime` datetime NOT NULL     COMMENT '创建时间',
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '更新时间',
+    `subMethod` tinyint(1)    DEFAULT '1'  COMMENT '扣分方式(1.系统自动,2.人工添加,3.大厅巡查)',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤绩效记录核查信息';
+
 -- ----------------------------
 -- 考勤绩效记录信息表
 -- ----------------------------