diff --git a/src/com/engine/organization/entity/scheme/SchemeTreeData.java b/src/com/engine/organization/entity/scheme/SchemeTreeData.java new file mode 100644 index 00000000..80e88520 --- /dev/null +++ b/src/com/engine/organization/entity/scheme/SchemeTreeData.java @@ -0,0 +1,20 @@ +package com.engine.organization.entity.scheme; + +import com.engine.organization.entity.TreeData; + +/** + * @author:dxfeng + * @createTime: 2023/08/17 + * @version: 1.0 + */ +public class SchemeTreeData extends TreeData { + private String subCompanyId; + + public String getSubCompanyId() { + return subCompanyId; + } + + public void setSubCompanyId(String subCompanyId) { + this.subCompanyId = subCompanyId; + } +} diff --git a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java index 3c54ec7e..daf8c39f 100644 --- a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java +++ b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java @@ -84,6 +84,7 @@ public class SchemeDTO { .schemeName(param.getSchemeName() == null ? null : param.getSchemeName()) .schemeDescription(param.getSchemeDescription() == null ? null : param.getSchemeDescription()) .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1) + .subCompanyId(param.getSubcompanyid()) .deleteType(0) .createTime(new Date()) .updateTime(new Date()) diff --git a/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java b/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java index 84d53a8d..1ac6b2b7 100644 --- a/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java +++ b/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java @@ -38,4 +38,6 @@ public class SchemeSearchParam { */ private Boolean forbiddenTag; + private Integer subcompanyid; + } diff --git a/src/com/engine/organization/entity/scheme/po/SchemePO.java b/src/com/engine/organization/entity/scheme/po/SchemePO.java index f1986ead..11da9ab1 100644 --- a/src/com/engine/organization/entity/scheme/po/SchemePO.java +++ b/src/com/engine/organization/entity/scheme/po/SchemePO.java @@ -53,4 +53,6 @@ public class SchemePO { */ private Date updateTime; + private Integer subCompanyId; + } diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index 8313afe6..b196cef4 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -18,6 +18,7 @@ import lombok.NoArgsConstructor; "t.scheme_name," + "t.scheme_description," + "t.forbidden_tag," + + "t.subcompanyid," + "t.is_used," + "t.creator," + "t.delete_type," + @@ -58,6 +59,9 @@ public class SchemeTableVO { @OrganizationTableColumn(text = "方案名称", width = "25%", column = "scheme_name") private String schemeName; + @OrganizationTableColumn(text = "所属分部", width = "25%", column = "subcompanyid",transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById") + private String subCompanyName; + /** * 方案描述 */ diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index cfec77e8..7af1439b 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -1,7 +1,7 @@ package com.engine.organization.mapper.scheme; -import com.engine.organization.entity.TreeData; +import com.engine.organization.entity.scheme.SchemeTreeData; import com.engine.organization.entity.scheme.po.SchemePO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; @@ -95,7 +95,7 @@ public interface SchemeMapper { * 获取左侧树 * @return */ - ArrayList getTreeData(); + ArrayList getTreeData(); List getSchemesByIds(@Param("ids")Collection ids); } diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index 6b3dea49..562d19cf 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -12,12 +12,14 @@ + - + + @@ -34,6 +36,7 @@ , t.create_time , t.update_time , t.is_used + , t.subcompanyid - select from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0 @@ -82,9 +86,11 @@ where delete_type = 0