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

!96 BUG修复 

Merge pull request !96 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-17 08:00:35 +00:00 committed by Gitee
parent 0409e587b8 20bafffd2f
commit bdfa0c3079
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,12 +40,14 @@
<if test=" extendType != null and extendType != '' ">
and extend_type = #{extendType}
</if>
order by show_order
</select>
<select id="getGroupNameById" resultType="java.lang.String">
select group_name
from jcl_field_extendgroup
where id = #{id}
and delete_type = 0
order by show_order
</select>
<select id="listGroupByIds" resultMap="BaseResultMap">
select
@ -56,20 +58,23 @@
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}
</foreach>
order by show_order
</select>
<select id="listGroupByPid" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_field_extendgroup t
WHERE t.delete_type = 0 and t.is_show = 1
WHERE t.delete_type = 0
and t.pid= #{pid}
order by show_order
</select>
<select id="getGroupById" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_field_extendgroup t
WHERE t.delete_type = 0 and t.is_show = 1
WHERE t.delete_type = 0
and t.id= #{id}
order by show_order
</select>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.extend.po.ExtendGroupPO"
@ -143,7 +148,7 @@
</trim>
</insert>
<update id="update" >
<update id="update">
update jcl_field_extendgroup
<set>
group_name=#{name},
@ -151,7 +156,7 @@
WHERE id = #{id} AND delete_type = 0
</update>
<delete id="delete" >
<delete id="delete">
update jcl_field_extendgroup
<set>
delete_type=1,
@ -159,7 +164,7 @@
WHERE id = #{id} AND delete_type = 0
</delete>
<update id="updateNameAndOrder" >
<update id="updateNameAndOrder">
update jcl_field_extendgroup
<set>
group_name=#{groupName},

4
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -69,7 +69,7 @@ public class CompServiceImpl extends Service implements CompService {
/**
* 公司/分部主表title指定ID
*/
private static final Long GROUP_ID = -1L;
private static final Long GROUP_ID = 1L;
private CompMapper getCompMapper() {
return MapperProxyFactory.getProxy(CompMapper.class);
@ -243,7 +243,7 @@ public class CompServiceImpl extends Service implements CompService {
if (CollectionUtils.isNotEmpty(extendTitles)) {
for (ExtendTitlePO extendTitle : extendTitles) {
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendTitle.getId() + "", "comp_no")));
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_COMP : JCL_ORG_COMPEXT, viewAttr, id, extendTitle.getId() + "", "comp_no")));
}
}

4
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -80,7 +80,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
/**
* 部门主表title指定ID
*/
private static final Long GROUP_ID = -2L;
private static final Long GROUP_ID = 2L;
private DepartmentMapper getDepartmentMapper() {
@ -296,7 +296,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId));
if (CollectionUtils.isNotEmpty(extendTitles)) {
for (ExtendTitlePO extendTitle : extendTitles) {
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_DEPTEXT : JCL_ORG_DEPT, viewAttr, id, extendTitle.getId().toString(), "dept_no")));
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_DEPT : JCL_ORG_DEPTEXT, viewAttr, id, extendTitle.getId().toString(), "dept_no")));
}
}

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

@ -32,6 +32,7 @@ import weaver.systeminfo.SystemEnv;
import weaver.workflow.field.BrowserComInfo;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@ -427,33 +428,37 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
@Override
public void deleteTree(Long id) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id);
//明细表删除字段信息 todo
//明细表删除字段信息、删除表结构
ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id);
List<ExtendInfoPO> extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), "");
List<Long> ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList());
// 删除数据
dropColumns(ids, extendGroupPO, extendInfoList);
}
@Override
public void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
List<Long> collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class)
.listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toList());
Set<Long> collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class)
.listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toSet());
Integer extendType = moduleTypeEnum.getValue();
List<ExtendGroupPO> extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class);
List<Long> collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList());
Set<Long> removeSet = new HashSet<>();
collect1.forEach(e -> {
if (!collect.contains(e)) {
removeSet.add(e);
if (collect.contains(e)) {
collect.remove(e);
}
});
if (CollectionUtils.isNotEmpty(removeSet)) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(removeSet);
if (CollectionUtils.isNotEmpty(collect)) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(collect);
}
int showOrder = 0;
AtomicInteger showOrder = new AtomicInteger(0);
extendGroupPOS.forEach(e -> {
showOrder.getAndIncrement();
e.setExtendType(extendType);
e.setPid(fieldTypeTreeParam.getParentId());
e.setShowOrder(showOrder + 1);
e.setShowOrder(showOrder.get());
e.setIsSystemDefault(1);
e.setCreator((long) user.getUID());
e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue());
@ -474,20 +479,10 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
public void deleteFieldDefined(ExtendFieldSearchParam param) {
Collection<Long> ids = param.getId();
Long groupType = param.getGroupType();
ExtendGroupPO groupById = getExtendGroupMapper().getGroupById(groupType);
ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType);
List<ExtendInfoPO> extendInfoList = getExtendInfoMapper().getExtendInfosByIds(ids);
// 删除数据
getExtendInfoMapper().deleteExtendInfoByIds(ids);
// 删除表结构
for (ExtendInfoPO extendInfoPO : extendInfoList) {
getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName());
// 明细表浏览按钮，额外删除span字段
if (null != groupById.getPid() && 3 == extendInfoPO.getControlType()) {
getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName() + "span");
}
}
dropColumns(ids, extendGroupPO, extendInfoList);
}
@ -496,6 +491,27 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
}
/**
* 删除数据及表结构
*
* @param ids
* @param extendGroupPO
* @param extendInfoList
*/
private void dropColumns(Collection<Long> ids, ExtendGroupPO extendGroupPO, List<ExtendInfoPO> extendInfoList) {
// 删除数据
getExtendInfoMapper().deleteExtendInfoByIds(ids);
// 删除表结构
for (ExtendInfoPO extendInfoPO : extendInfoList) {
getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName());
// 明细表浏览按钮，额外删除span字段
if (null != extendGroupPO.getPid() && 3 == extendInfoPO.getControlType()) {
getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName() + "span");
}
}
}
private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) {
return ExtendTitlePO.builder()
.groupId(extendGroupPO.getId())

4
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -97,7 +97,7 @@ public class JobServiceImpl extends Service implements JobService {
/**
* 岗位主表title指定ID
*/
private static final Long GROUP_ID = -3L;
private static final Long GROUP_ID = 3L;
private JobMapper getJobMapper() {
return MapperProxyFactory.getProxy(JobMapper.class);
@ -281,7 +281,7 @@ public class JobServiceImpl extends Service implements JobService {
List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID);
if (CollectionUtils.isNotEmpty(extendTitles)) {
for (ExtendTitlePO extendTitle : extendTitles) {
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_JOBEXT : JCL_ORG_JOB, viewAttr, id, extendTitle.getId().toString(), "job_no")));
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "job_no")));
}
}
HashMap<String, Object> resultMap = new HashMap<>();