港大医院 考勤明细增加 “备注”字段内容。

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/domain/AttendanceDetail.java

@@ -467,8 +467,10 @@ public class AttendanceDetail extends AbstractDomain<String, AttendanceDetailPo>
 		// 标记哪些字段被修改了
 		boolean isDaKa1Modified = false;
 		boolean isDaKa2Modified = false;
+		boolean isBeiZhuModified = false;
 		String newDaKa1 = po.getDaKaShiJian1();
 		String newDaKa2 = po.getDaKaShiJian2();
+		String newBeiZhu = po.getBeiZhu();
 
 		// 5. 处理传入的上班打卡时间
 		LocalDateTime newDaKa1Time = null;
@@ -511,6 +513,12 @@ public class AttendanceDetail extends AbstractDomain<String, AttendanceDetailPo>
 			records.setJiaBanShiChang(jiaBan);
 			isDaKa2Modified = true;
 		}
+		
+		// 6.1 处理传入的备注字段
+		if (BeanUtils.isNotEmpty(newBeiZhu)) {
+			records.setBeiZhu(newBeiZhu);
+			isBeiZhuModified = true;
+		}
 		// 7.0 修改上下班时间，需要重新计算班次时长（配置下班时间 - 配置上班时间）
 		// 注意：需要重新获取配置上下班时间的完整 LocalDateTime，因为可能跨日
 		LocalDateTime configStartFullTime = LocalDateTime.parse(riQi + " " + shangBanShiJian + ":00", DATETIME_FORMATTER);
@@ -586,6 +594,10 @@ public class AttendanceDetail extends AbstractDomain<String, AttendanceDetailPo>
 			updateCond.put("zhuang_tai_2_", records.getZhuangTai2());
 			updateCond.put("jia_ban_shi_chang", String.valueOf(records.getJiaBanShiChang()));
 		}
+		// 备注字段
+		if (isBeiZhuModified) {
+			updateCond.put("bei_zhu_", records.getBeiZhu());
+		}
 		// 工作时长（总是更新，因为可能因修改而变化）
 		updateCond.put("gong_zuo_shi_chan", String.valueOf(records.getGongZuoShiChan()));
 		// 考勤状态

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/AttendanceDetailTbl.java

@@ -72,6 +72,8 @@ public class AttendanceDetailTbl extends AbstractPo<String>{
 	protected Long  daKaCiShu; 		/*打卡次数*/
 	@ApiModelProperty(value = "排班名称")
 	protected String  paiBanMingChen; 		/*排班名称*/
+	@ApiModelProperty(value = "备注")
+	protected String  beiZhu; 		/*备注*/
 
 	public void setId(String id) 
 	{
@@ -397,5 +399,17 @@ public class AttendanceDetailTbl extends AbstractPo<String>{
 	{
 		return this.paiBanMingChen;
 	}
+	public void setBeiZhu(String beiZhu) 
+	{
+		this.beiZhu = beiZhu;
+	}
+	/**
+	 * 返回 备注
+	 * @return
+	 */
+	public String getBeiZhu() 
+	{
+		return this.beiZhu;
+	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/AttendanceDetail.map.xml

@@ -34,17 +34,18 @@
 		<result property="kaoQinZhuangTa" column="KAO_QIN_ZHUANG_TA" jdbcType="VARCHAR"/>
 		<result property="daKaCiShu" column="DA_KA_CI_SHU_" jdbcType="NUMERIC"/>
 		<result property="paiBanMingChen" column="PAI_BAN_MING_CHEN" jdbcType="VARCHAR"/>
+		<result property="beiZhu" column="BEI_ZHU_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,KUAI_ZHAO_,PAI_BAN_ID_,PAI_BAN_JI_LU_ID_,RI_QI_,YONG_HU_ID_,BU_MEN_,GONG_HAO_,BAN_CI_MING_,BAN_CI_BIE_MING_,BAN_CI_KAI_SHI_,BAN_CI_JIE_SHU_,SHI_FOU_KUA_RI_,BAN_CI_SHI_CHANG_,DA_KA_SHI_JIAN_1_,ZHUANG_TAI_1_,DA_KA_SHI_JIAN_2_,ZHUANG_TAI_2_,GONG_ZUO_SHI_CHAN,CHI_DAO_SHI_CHANG,JIA_BAN_SHI_CHANG,KAO_QIN_ZHUANG_TA,DA_KA_CI_SHU_,PAI_BAN_MING_CHEN
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,KUAI_ZHAO_,PAI_BAN_ID_,PAI_BAN_JI_LU_ID_,RI_QI_,YONG_HU_ID_,BU_MEN_,GONG_HAO_,BAN_CI_MING_,BAN_CI_BIE_MING_,BAN_CI_KAI_SHI_,BAN_CI_JIE_SHU_,SHI_FOU_KUA_RI_,BAN_CI_SHI_CHANG_,DA_KA_SHI_JIAN_1_,ZHUANG_TAI_1_,DA_KA_SHI_JIAN_2_,ZHUANG_TAI_2_,GONG_ZUO_SHI_CHAN,CHI_DAO_SHI_CHANG,JIA_BAN_SHI_CHANG,KAO_QIN_ZHUANG_TA,DA_KA_CI_SHU_,PAI_BAN_MING_CHEN,BEI_ZHU_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.AttendanceDetailPo">
 		INSERT INTO T_ATTENDANCE_DETAIL
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{diDian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{paiBanId,jdbcType=VARCHAR}, #{paiBanJiLuId,jdbcType=VARCHAR}, #{riQi,jdbcType=VARCHAR}, #{yongHuId,jdbcType=VARCHAR}, #{buMen,jdbcType=VARCHAR}, #{gongHao,jdbcType=VARCHAR}, #{banCiMing,jdbcType=VARCHAR}, #{banCiBieMing,jdbcType=VARCHAR}, #{banCiKaiShi,jdbcType=VARCHAR}, #{banCiJieShu,jdbcType=VARCHAR}, #{shiFouKuaRi,jdbcType=VARCHAR}, #{banCiShiChang,jdbcType=NUMERIC}, #{daKaShiJian1,jdbcType=VARCHAR}, #{zhuangTai1,jdbcType=VARCHAR}, #{daKaShiJian2,jdbcType=VARCHAR}, #{zhuangTai2,jdbcType=VARCHAR}, #{gongZuoShiChan,jdbcType=NUMERIC}, #{chiDaoShiChang,jdbcType=NUMERIC}, #{jiaBanShiChang,jdbcType=NUMERIC}, #{kaoQinZhuangTa,jdbcType=VARCHAR}, #{daKaCiShu,jdbcType=NUMERIC}, #{paiBanMingChen,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{diDian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{paiBanId,jdbcType=VARCHAR}, #{paiBanJiLuId,jdbcType=VARCHAR}, #{riQi,jdbcType=VARCHAR}, #{yongHuId,jdbcType=VARCHAR}, #{buMen,jdbcType=VARCHAR}, #{gongHao,jdbcType=VARCHAR}, #{banCiMing,jdbcType=VARCHAR}, #{banCiBieMing,jdbcType=VARCHAR}, #{banCiKaiShi,jdbcType=VARCHAR}, #{banCiJieShu,jdbcType=VARCHAR}, #{shiFouKuaRi,jdbcType=VARCHAR}, #{banCiShiChang,jdbcType=NUMERIC}, #{daKaShiJian1,jdbcType=VARCHAR}, #{zhuangTai1,jdbcType=VARCHAR}, #{daKaShiJian2,jdbcType=VARCHAR}, #{zhuangTai2,jdbcType=VARCHAR}, #{gongZuoShiChan,jdbcType=NUMERIC}, #{chiDaoShiChang,jdbcType=NUMERIC}, #{jiaBanShiChang,jdbcType=NUMERIC}, #{kaoQinZhuangTa,jdbcType=VARCHAR}, #{daKaCiShu,jdbcType=NUMERIC}, #{paiBanMingChen,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="AttendanceDetailPo">
@@ -127,7 +128,8 @@
 		JIA_BAN_SHI_CHANG=#{jiaBanShiChang,jdbcType=NUMERIC},
 		KAO_QIN_ZHUANG_TA=#{kaoQinZhuangTa,jdbcType=VARCHAR},
 		DA_KA_CI_SHU_=#{daKaCiShu,jdbcType=NUMERIC},
-		PAI_BAN_MING_CHEN=#{paiBanMingChen,jdbcType=VARCHAR}
+		PAI_BAN_MING_CHEN=#{paiBanMingChen,jdbcType=VARCHAR},
+		BEI_ZHU_=#{beiZhu,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>