liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 

 Conflicts:
	src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
This commit is contained in:
dxfeng 2022-06-17 11:51:48 +08:00
parent 84adef0520 bb324ad8d1
commit fdf2572654
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
View File

@ -5,6 +5,7 @@
<result column="id" property="id"/>
<result column="extend_type" property="extendType"/>
<result column="group_name" property="groupName"/>
<result column="show_order" property="showOrder"/>
<result column="is_system_default" property="isSystemDefault"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
@ -22,6 +23,7 @@
, t.group_name
, t.is_system_default
, t.creator
, t.show_order
, t.delete_type
, t.create_time
, t.update_time
@ -99,6 +101,9 @@
<if test="isShow != null ">
is_show,
</if>
<if test="showOrder != null ">
show_order,
</if>
<if test="isSystemDefault != null ">
is_system_default,
</if>
@ -128,13 +133,16 @@
<if test="isShow != null ">
#{isShow},
</if>
<if test="showOrder != null ">
#{showOrder},
</if>
<if test="isSystemDefault != null ">
#{isSystemDefault},
</if>
</trim>
</insert>
<update id="update">
<update id="update" >
update jcl_field_extendgroup
<set>
group_name=#{name},
@ -142,7 +150,7 @@
WHERE id = #{id} AND delete_type = 0
</update>
<delete id="delete">
<delete id="delete" >
update jcl_field_extendgroup
<set>
delete_type=1,
@ -150,7 +158,7 @@
WHERE id = #{id} AND delete_type = 0
</delete>
<update id="updateNameAndOrder">
<update id="updateNameAndOrder" >
update jcl_field_extendgroup
<set>
group_name=#{groupName},

10
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
View File

@ -199,14 +199,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
@Override
public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
if (fieldTypeTreeParam.getId() == null) {
List<ExtendGroupPO> extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId());
List<ExtendGroupPO> extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(moduleTypeEnum.getValue());
ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get();
ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder());
MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO);
//默认新增title
List<ExtendTitlePO> titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId());
ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get();
ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, extendTitle.getShowOrder());
ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, 1);
MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO);
} else {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName());
@ -429,6 +427,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
@Override
public void deleteTree(Long id) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id);
//明细表删除字段信息 todo
}
@Override
@ -499,7 +499,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
return ExtendTitlePO.builder()
.groupId(extendGroupPO.getId())
.title(extendGroupPO.getGroupName())
.showOrder(++max)
.showOrder(max)
.isShow("1")
.isSystemDefault(1)
.creator((long) user.getUID())