refactor(oa): 重构薪资计算逻辑并添加项目签约公司字段
- 将 SalaryCalculationResult 类从 OaEmployeeTemplateBindingServiceImpl 中提取到域模型包下- 在 SysOaProject 模型中添加 signingCompany 字段用于记录签约公司 - 更新相关 BO、VO 和 Mapper 文件以支持新增的签约公司字段 - 优化 SysOaProjectServiceImpl 中的查询条件,支持按签约公司筛选- 修复 SysOssServiceImpl 中的文件下载逻辑,使用 baseMapper 替代 AOP 代理
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
<result property="accessory" column="accessory"/>
|
||||
<result property="bail" column="bail"/>
|
||||
<result property="closureFiles" column="closure_files"/>
|
||||
<result property="signingCompany" column="signing_company"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
@@ -63,7 +64,7 @@
|
||||
<result property="count" column="count"/>
|
||||
<result property="laborCost" column="labor_cost"/>
|
||||
<result property="projectCode" column="project_code"/>
|
||||
|
||||
<result property="signingCompany" column="signing_company"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -301,6 +302,7 @@
|
||||
p.postpone_reason,
|
||||
p.postpone_time,
|
||||
p.color,
|
||||
p.signing_company,
|
||||
TIMESTAMPDIFF(DAY, NOW(), p.postpone_time) AS remainTime
|
||||
FROM sys_oa_project p
|
||||
|
||||
|
||||
Reference in New Issue
Block a user