feat(cost&wms): 新增成本模块与考勤优化功能
1. 新增成本相关业务模块:成本项目配置、成本单价历史、生产月报、生产指标明细、生产成本明细的CRUD接口与页面 2. 为生产月报实体增加列配置字段及数据库映射 3. 优化考勤查询接口,将get请求改为post并使用body传参 4. 考勤页面增加部门筛选、员工多选筛选和打卡记录展示功能
This commit is contained in:
@@ -54,6 +54,10 @@ public class CostProdReport extends BaseEntity {
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 列配置JSON
|
||||
*/
|
||||
private String colConfig;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
|
||||
@@ -58,5 +58,9 @@ public class CostProdReportBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 列配置JSON
|
||||
*/
|
||||
private String colConfig;
|
||||
|
||||
}
|
||||
|
||||
@@ -64,5 +64,9 @@ public class CostProdReportVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 列配置JSON
|
||||
*/
|
||||
private String colConfig;
|
||||
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="inputWeight" column="input_weight"/>
|
||||
<result property="outputWeight" column="output_weight"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="colConfig" column="col_config"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
|
||||
Reference in New Issue
Block a user