Commit b75bef0d authored by 廖旭伟's avatar 廖旭伟

窗口人员考核汇总明细增加字段

parent fd32a241
...@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.vo.WindowWorkmanPerformDetailVo; import com.mortals.xhx.module.window.model.vo.WindowWorkmanPerformDetailVo;
import lombok.Data; import lombok.Data;
/** /**
* 窗口人员考核汇总明细实体对象 * 窗口人员考核汇总明细实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-01-17 * @date 2024-01-30
*/ */
@Data @Data
public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetailVo { public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetailVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -68,6 +68,22 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail ...@@ -68,6 +68,22 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 所属部门id
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -97,5 +113,9 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail ...@@ -97,5 +113,9 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail
this.sumScore = BigDecimal.ZERO; this.sumScore = BigDecimal.ZERO;
this.examineLevel = 0; this.examineLevel = 0;
this.remark = ""; this.remark = "";
this.deptId = null;
this.deptName = "";
this.salaId = null;
this.salaName = "";
} }
} }
\ No newline at end of file
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="deptId" column="deptId" />
<result property="deptName" column="deptName" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime, b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.deptId,b.deptName,b.salaId,b.salaName
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
......
...@@ -1168,3 +1168,8 @@ CREATE TABLE mortals_xhx_perform_error_record( ...@@ -1168,3 +1168,8 @@ CREATE TABLE mortals_xhx_perform_error_record(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常记录信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常记录信息';
ALTER TABLE `mortals_xhx_window_workman_perform_detail` ADD COLUMN `deptId` bigint(20) COMMENT '所属部门id' AFTER `staffName`,
ADD COLUMN `deptName` varchar(256) COMMENT '所属部门名称' AFTER `deptId`,
ADD COLUMN `salaId` bigint(20) COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) COMMENT '所属大厅名称' AFTER `salaId`;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment