qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

账套项目删除bug

This commit is contained in:
钱涛 2022-05-18 14:34:06 +08:00
parent 27b04da333
commit dc1c865a4b
7 changed files with 6864 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4381
resource/sql/mysql.sql
View File

File diff suppressed because it is too large Load Diff

2604
resource/sql/sqlserver.sql
View File

File diff suppressed because it is too large Load Diff

4
resource/sql/初始化系统薪资项目及对应的公式.sql
View File

@ -194,3 +194,7 @@ INSERT INTO hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete,
INSERT INTO hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291654, 'departmentName', 2, 0, 0, '2022-02-23 17:32:08', '2022-02-23 17:32:08', 0, 'all_teams');
ALTER TABLE hrsa_salary_sob_item ADD COLUMN can_delete int(0) NULL COMMENT '是否可删除，0：不可删除，1：可删除' AFTER tenant_key;
ALTER TABLE hrsa_salary_sob_item ADD can_delete int NULL
GO

2
src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
View File

@ -104,7 +104,7 @@ public class SalarySobItemAggregateBO {
.taxDeclarationColumn(SalaryItemBO.buildTaxDeclarationColumn(salaryItemPO.getCode()))
.sortedIndex(i)
.canEdit(Objects.equals(salaryItemPO.getCanEdit(), 1))
.canDelete(Objects.equals(salarySobItemPO.getCanDelete(), 1))
.canDelete(salarySobItemPO.getCanDelete() == null || Objects.equals(salarySobItemPO.getCanDelete(), 1))
.build());
}
if (!salarySobItemGroupDTOMap.containsKey(k)) {

2
src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java
View File

@ -72,6 +72,8 @@ public class SalarySobItemSaveParam {
//公式")
private Long formulaId;
private Boolean canDelete;
}
@Data

27
src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
View File

@ -14,6 +14,7 @@
<result column="sorted_index" property="sortedIndex"/>
<result column="tenant_key" property="tenantKey"/>
<result column="update_time" property="updateTime"/>
<result column="can_delete" property="canDelete"/>
</resultMap>
<!-- 表字段 -->
@ -32,6 +33,7 @@
, t.sorted_index
, t.tenant_key
, t.update_time
,t.can_delete
</sql>
<!-- 查询全部 -->
@ -161,6 +163,9 @@
<if test="updateTime != null">
update_time,
</if>
<if test="canDelete != null">
can_delete,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="createTime != null">
@ -199,6 +204,9 @@
<if test="updateTime != null">
#{updateTime},
</if>
<if test="canDelete != null">
can_delete,
</if>
</trim>
</insert>
@ -217,6 +225,7 @@
sorted_index=#{sortedIndex},
tenant_key=#{tenantKey},
update_time=#{updateTime},
can_delete=#{canDelete},
</set>
WHERE id = #{id} AND delete_type = 0
</update>
@ -259,6 +268,9 @@
<if test="updateTime != null">
update_time=#{updateTime},
</if>
<if test="canDelete != null">
can_delete=#{canDelete},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>
@ -295,7 +307,7 @@
<insert id="batchInsert">
INSERT INTO hrsa_salary_sob_item(salary_sob_id, salary_item_id, salary_sob_item_group_id, formula_id,
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key)
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key,can_delete)
VALUES
<foreach collection="collection" item="item" separator=",">
(
@ -309,13 +321,14 @@
#{item.updateTime},
#{item.creator},
#{item.deleteType},
#{item.tenantKey}
#{item.tenantKey},
#{item.canDelete}
)
</foreach>
</insert>
<insert id="batchInsert" databaseId="oracle">
INSERT INTO hrsa_salary_sob_item( salary_sob_id, salary_item_id, salary_sob_item_group_id, formula_id,
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key)
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key,can_delete)
<foreach collection="collection" item="item" separator="union all">
select
@ -329,14 +342,15 @@
#{item.updateTime},
#{item.creator},
#{item.deleteType},
#{item.tenantKey}
#{item.tenantKey},
#{item.canDelete}
from dual
</foreach>
</insert>
<insert id="batchInsert" databaseId="sqlserver">
<foreach collection="collection" item="item" separator=";">
INSERT INTO hrsa_salary_sob_item( salary_sob_id, salary_item_id, salary_sob_item_group_id, formula_id,
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key)
sorted_index, description, create_time, update_time, creator, delete_type, tenant_key,can_delete)
VALUES
(
#{item.salarySobId},
@ -349,7 +363,8 @@
#{item.updateTime},
#{item.creator},
#{item.deleteType},
#{item.tenantKey}
#{item.tenantKey},
#{item.canDelete}
)
</foreach>
</insert>

5
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -134,7 +134,6 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
// 校验
validSaveParam(saveParam);
//fixme 事务
//清除原数据
cleanOldData(salarySobId);
@ -218,7 +217,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
int sortedIndex = 0;
for (SalarySobItemSaveParam.SalarySobItemGroupParam itemGroupParam : saveParam.getItemGroups()) {
Long salarySobItemGroupId = IdGenerator.generate();
SalarySobItemGroupPO salarySobItemGroupPO = SalarySobItemGroupPO.builder()
SalarySobItemGroupPO salarySobItemGroupPO = SalarySobItemGroupPO.builder()
.id(salarySobItemGroupId)
.salarySobId(salarySobId)
.name(itemGroupParam.getName())
@ -250,6 +249,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
.updateTime(now)
.deleteType(NumberUtils.INTEGER_ZERO)
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.canDelete(itemParam.getCanDelete() == null ? NumberUtils.INTEGER_ONE : (itemParam.getCanDelete() ? NumberUtils.INTEGER_ONE : NumberUtils.INTEGER_ZERO))
.build();
salarySobItems.add(salarySobItemPO);
}
@ -269,6 +269,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
.updateTime(now)
.deleteType(NumberUtils.INTEGER_ZERO)
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.canDelete(itemParam.getCanDelete() == null ? NumberUtils.INTEGER_ONE : (itemParam.getCanDelete() ? NumberUtils.INTEGER_ONE : NumberUtils.INTEGER_ZERO))
.build();
salarySobItems.add(salarySobItemPO);
}