临时提交

src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java

@@ -49,5 +49,7 @@ public class AttendanceAssistant implements Serializable{
 
 
 	String attgroupid;
 	String attgroupid;
 	
 	
+	int overtimeRulesId;//加班id
+	
 	int fieldpersonnel;//外勤
 	int fieldpersonnel;//外勤
 }
 }

src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java

@@ -43,6 +43,7 @@ public class AttendanceGroup implements Serializable{
 	private String dkfs;// 打卡方式
 	private String dkfs;// 打卡方式
 
 
 	private Integer isWq;//外勤
 	private Integer isWq;//外勤
+	private Integer overtimeRulesId;
 	
 	
 	private Integer kqjid;
 	private Integer kqjid;
 
 

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -1437,6 +1437,7 @@ public class AttController {
 				attgro.setZcgzsc(attass.getNormalWorkTime());//正常工作时长（自由工时专用）
 				attgro.setZcgzsc(attass.getNormalWorkTime());//正常工作时长（自由工时专用）
 				attgro.setJbzdsc(attass.getMaxOvertimeTime());//加班最大时长（自由工时专用）
 				attgro.setJbzdsc(attass.getMaxOvertimeTime());//加班最大时长（自由工时专用）
 			}
 			}
+			attgro.setOvertimeRulesId(attass.getOvertimeRulesId());//加班规则ID
 			attendancegroupservice.updateByPrimaryKeySelective(attgro);
 			attendancegroupservice.updateByPrimaryKeySelective(attgro);
 			
 			
 			/*********/
 			/*********/

src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml

@@ -29,6 +29,7 @@
     <result column="dkfs" property="dkfs" jdbcType="VARCHAR" />
     <result column="dkfs" property="dkfs" jdbcType="VARCHAR" />
     <result column="kqjid" property="kqjid" jdbcType="INTEGER" />
     <result column="kqjid" property="kqjid" jdbcType="INTEGER" />
     <result column="is_wq" property="isWq" jdbcType="INTEGER" />
     <result column="is_wq" property="isWq" jdbcType="INTEGER" />
+    <result column="overtime_rules_id" property="overtimeRulesId" />
     
     
     <collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode">
     <collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode">
    		<result column="kqzId" property="kqzId" jdbcType="INTEGER" />
    		<result column="kqzId" property="kqzId" jdbcType="INTEGER" />
@@ -92,7 +93,7 @@
   
   
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx, 
     id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx, 
-    txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq
+    txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id
   </sql>
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     select 
@@ -180,6 +181,9 @@
       <if test="isWq != null" >
       <if test="isWq != null" >
         is_wq,
         is_wq,
       </if>
       </if>
+      <if test="overtimeRulesId != null" >
+        overtime_rules_id,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       
       
@@ -240,6 +244,9 @@
       <if test="isWq != null" >
       <if test="isWq != null" >
         #{isWq,jdbcType=INTEGER},
         #{isWq,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="overtimeRulesId != null" >
+        #{overtimeRulesId,jdbcType=INTEGER},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" >
   <update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" >
@@ -302,6 +309,9 @@
       <if test="isWq != null" >
       <if test="isWq != null" >
         is_wq = #{isWq,jdbcType=INTEGER},
         is_wq = #{isWq,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="overtimeRulesId != null" >
+        overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
@@ -325,7 +335,8 @@
       is_wpbsdk = #{isWpbsdk,jdbcType=INTEGER},
       is_wpbsdk = #{isWpbsdk,jdbcType=INTEGER},
       sybc = #{sybc,jdbcType=VARCHAR},
       sybc = #{sybc,jdbcType=VARCHAR},
       is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
       is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
-      is_wq = #{isWq,jdbcType=INTEGER}
+      is_wq = #{isWq,jdbcType=INTEGER},
+      overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>