From 2d53588d39082e7b3b6418fec663380cdd402e40 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 11 May 2022 15:37:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=BA=A7=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=B1=BB=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/scheme/dto/GradeDTO.java | 88 +++++++++ .../entity/scheme/param/GradeSearchParam.java | 49 +++++ .../entity/scheme/po/GradePO.java | 66 +++++++ .../entity/scheme/vo/GradeTableVO.java | 81 ++++++++ .../mapper/scheme/GradeMapper.java | 69 +++++++ .../mapper/scheme/GradeMapper.xml | 148 +++++++++++++++ .../organization/service/GradeService.java | 81 ++++++++ .../organization/service/LevelService.java | 2 +- .../service/impl/GradeServiceImpl.java | 177 ++++++++++++++++++ .../service/impl/LevelServiceImpl.java | 4 +- .../service/impl/SchemeServiceImpl.java | 3 - .../organization/web/LevelController.java | 4 +- .../organization/wrapper/GradeWrapper.java | 111 +++++++++++ .../organization/wrapper/LevelWrapper.java | 4 +- 14 files changed, 876 insertions(+), 11 deletions(-) create mode 100644 src/com/engine/organization/entity/scheme/dto/GradeDTO.java create mode 100644 src/com/engine/organization/entity/scheme/param/GradeSearchParam.java create mode 100644 src/com/engine/organization/entity/scheme/po/GradePO.java create mode 100644 src/com/engine/organization/entity/scheme/vo/GradeTableVO.java create mode 100644 src/com/engine/organization/mapper/scheme/GradeMapper.java create mode 100644 src/com/engine/organization/mapper/scheme/GradeMapper.xml create mode 100644 src/com/engine/organization/service/GradeService.java create mode 100644 src/com/engine/organization/service/impl/GradeServiceImpl.java create mode 100644 src/com/engine/organization/wrapper/GradeWrapper.java diff --git a/src/com/engine/organization/entity/scheme/dto/GradeDTO.java b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java new file mode 100644 index 00000000..88286451 --- /dev/null +++ b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java @@ -0,0 +1,88 @@ +package com.engine.organization.entity.scheme.dto; + +import com.engine.organization.entity.scheme.param.GradeSearchParam; +import com.engine.organization.entity.scheme.po.GradePO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/11 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class GradeDTO { + /** + * 主键 + */ + private long id; + /** + * 编号 + */ + private String gradeNo; + /** + * 名称 + */ + private String gradeName; + /** + * 描述说明 + */ + private String description; + /** + * 等级方案 + */ + private long schemeId; + /** + * 职等 + */ + private long levelId; + /** + * 禁用标记 + */ + private int forbiddenTag; + + /** + * + */ + private Long creator; + /** + * + */ + private int deleteType; + /** + * + */ + private Date createTime; + /** + * + */ + private Date updateTime; + + public static GradePO convertParamToPO(GradeSearchParam param, Long employeeId) { + if (param == null) { + return null; + } + return GradePO.builder() + .id(param.getId() == null ? 0 : param.getId()) + .gradeNo(param.getGradeNo() == null ? null : param.getGradeNo()) + .gradeName(param.getGradeName() == null ? null : param.getGradeName()) + .description(param.getDescription() == null ? null : param.getDescription()) + .schemeId(param.getSchemeId() == null ? 0 : param.getSchemeId()) + .levelId(param.getLevelId() == null ? 0 : param.getLevelId()) + .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1) + .deleteType(0) + .createTime(new Date()) + .updateTime(new Date()) + .creator(employeeId) + .build(); + } + +} diff --git a/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java new file mode 100644 index 00000000..85308c99 --- /dev/null +++ b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java @@ -0,0 +1,49 @@ +package com.engine.organization.entity.scheme.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/11 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class GradeSearchParam { + + /** + * 主键 + */ + private Long id; + /** + * 编号 + */ + private String gradeNo; + /** + * 名称 + */ + private String gradeName; + /** + * 描述说明 + */ + private String description; + /** + * 等级方案 + */ + private Long schemeId; + /** + * 职等 + */ + private Long levelId; + /** + * 禁用标记 + */ + private Boolean forbiddenTag; + +} diff --git a/src/com/engine/organization/entity/scheme/po/GradePO.java b/src/com/engine/organization/entity/scheme/po/GradePO.java new file mode 100644 index 00000000..056c5911 --- /dev/null +++ b/src/com/engine/organization/entity/scheme/po/GradePO.java @@ -0,0 +1,66 @@ +package com.engine.organization.entity.scheme.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/11 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class GradePO { + /** + * 主键 + */ + private long id; + /** + * 编号 + */ + private String gradeNo; + /** + * 名称 + */ + private String gradeName; + /** + * 描述说明 + */ + private String description; + /** + * 等级方案 + */ + private long schemeId; + /** + * 职等 + */ + private long levelId; + /** + * 禁用标记 + */ + private int forbiddenTag; + /** + * + */ + private Long creator; + /** + * + */ + private int deleteType; + /** + * + */ + private Date createTime; + /** + * + */ + private Date updateTime; + +} diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java new file mode 100644 index 00000000..56fa2a4f --- /dev/null +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -0,0 +1,81 @@ +package com.engine.organization.entity.scheme.vo; + +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/11 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "1afe425c-d0f8-11ec-b80e-00ffcbed7508", + fields = "t.id ," + + " t.grade_no ," + + " t.grade_name ," + + " t.description ," + + " a.scheme_name ," + + " b.level_name ," + + " t.forbidden_tag", + fromSql = "from jcl_org_grade t inner join jcl_org_scheme a on t.scheme_id = a.id inner join jcl_org_level b on t.level_id = b.id ", + orderby = "id desc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "删除") + } +) +public class GradeTableVO { + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no") + private String gradeNo; + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name") + private String gradeName; + /** + * 描述说明 + */ + @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description") + private String description; + /** + * 等级方案 + */ + private long schemeId; + /** + * 等级方案 + */ + @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + private String schemeName; + /** + * 职等 + */ + private long levelId; + /** + * 职等 + */ + @OrganizationTableColumn(text = "等级方案", width = "20%", column = "level_name") + private String levelName; + /** + * 禁用标记 + */ + @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + private int forbiddenTag; +} diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.java b/src/com/engine/organization/mapper/scheme/GradeMapper.java new file mode 100644 index 00000000..6fd3a36d --- /dev/null +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.java @@ -0,0 +1,69 @@ +package com.engine.organization.mapper.scheme; + + +import com.engine.organization.entity.scheme.po.GradePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +/** + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/11 + * @Version V1.0 + **/ +public interface GradeMapper { + + /** + * 根据No查询登记方案 + * + * @param gradeNo + * @return + */ + List listByNo(@Param("gradeNo") String gradeNo); + + /** + * 获取职等根据ID + * @param id + * @return + */ + GradePO getGradeByID(@Param("id") long id); + + /** + * 插入职等 + * @param gradePO + * @return + */ + int insertIgnoreNull(GradePO gradePO); + + /** + * 修改，修改所有字段 + * + * @param gradePO + * @return + */ + int updateGrade(GradePO gradePO); + + /** + * 更新禁用标记 + * + * @param gradePO + * @return + */ + int updateForbiddenTagById(GradePO gradePO); + + /** + * 批量删除登记方案 + * + * @param ids + */ + int deleteByIds(@Param("ids") Collection ids); + + /** + * 根据禁用标记统计 + * @param tag + * @return + */ + int getCountByTag(@Param("tag") int tag); +} diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml new file mode 100644 index 00000000..6013878b --- /dev/null +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + t + . + id + , t.grade_no + , t.grade_name + , t.description + , t.scheme_id + , t.level_id + , t.forbidden_tag + , t.creator + , t.delete_type + , t.create_time + , t.update_time + + + + + + + + update jcl_org_grade + + creator=#{creator}, + update_time=#{updateTime}, + grade_no=#{gradeNo}, + grade_name=#{gradeName}, + description=#{description}, + scheme_id=#{schemeId}, + level_id=#{levelId}, + + WHERE id = #{id} AND delete_type = 0 + + + + INSERT INTO jcl_org_grade + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + grade_no, + + + grade_name, + + + description, + + + scheme_id, + + level_id, + + forbidden_tag, + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{gradeNo}, + + + #{gradeName}, + + + #{description}, + + + #{schemeId}, + + #{levelId}, + + 0, + + + + + update jcl_org_grade + + forbidden_tag=#{forbiddenTag}, + + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE jcl_org_grade + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java new file mode 100644 index 00000000..1bba061c --- /dev/null +++ b/src/com/engine/organization/service/GradeService.java @@ -0,0 +1,81 @@ +package com.engine.organization.service; + +import com.engine.organization.entity.scheme.param.GradeSearchParam; + +import java.util.Collection; +import java.util.Map; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/11 + * @version: 1.0 + */ +public interface GradeService { + /** + * 职等列表 + * + * @param params + * @return + */ + Map listPage(Map params); + + /** + * 新增职等 + * @param param + * @return + */ + int saveGrade(GradeSearchParam param); + + /** + * 更新职等信息 + * + * @param param + * @return + */ + int updateGrade(GradeSearchParam param); + + /** + * 更新禁用标记 + * + * @param params + */ + int updateForbiddenTagById(GradeSearchParam params); + + /** + * 根据ID批量删除 + * + * @param ids + */ + int deleteByIds(Collection ids); + + /** + * 获取搜索条件 + * + * @param params + * @return + */ + Map getSearchCondition(Map params); + + + /** + * 获取新增表单 + * + * @param params + * @return + */ + Map getGradeForm(Map params); + + /** + * 获取列表页面按钮信息 + * @return + */ + Map getTableBtn(); + + /** + * 获取列表tabs + * @return + */ + Map getTabInfo(); + +} diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java index d6f6b088..9cf15c3e 100644 --- a/src/com/engine/organization/service/LevelService.java +++ b/src/com/engine/organization/service/LevelService.java @@ -76,6 +76,6 @@ public interface LevelService { * 获取列表tabs * @return */ - Map getTableInfo(); + Map getTabInfo(); } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java new file mode 100644 index 00000000..f2903ab0 --- /dev/null +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -0,0 +1,177 @@ +package com.engine.organization.service.impl; + +import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; +import com.cloudstore.eccom.result.WeaResultMsg; +import com.engine.core.impl.Service; +import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.TopTab; +import com.engine.organization.entity.scheme.dto.GradeDTO; +import com.engine.organization.entity.scheme.param.GradeSearchParam; +import com.engine.organization.entity.scheme.po.GradePO; +import com.engine.organization.entity.scheme.vo.GradeTableVO; +import com.engine.organization.mapper.scheme.GradeMapper; +import com.engine.organization.service.GradeService; +import com.engine.organization.util.MenuBtn; +import com.engine.organization.util.OrganizationAssert; +import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.db.DBType; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; +import weaver.general.StringUtil; +import weaver.general.Util; + +import java.util.*; + + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/11 + * @version: 1.0 + */ +public class GradeServiceImpl extends Service implements GradeService { + + private GradeMapper getGradeMapper() { + return MapperProxyFactory.getProxy(GradeMapper.class); + } + + @Override + public Map listPage(Map params) { + OrganizationWeaTable table = new OrganizationWeaTable<>(user, GradeTableVO.class); + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + return result.getResultMap(); + } + + + @Override + public int saveGrade(GradeSearchParam param) { + List list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); + System.out.println(gradePO); + return getGradeMapper().insertIgnoreNull(gradePO); + } + + @Override + public int updateGrade(GradeSearchParam param) { + GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); + return getGradeMapper().updateGrade(gradePO); + } + + @Override + public int updateForbiddenTagById(GradeSearchParam params) { + GradePO gradePO = GradePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); + return getGradeMapper().updateForbiddenTagById(gradePO); + } + + @Override + public int deleteByIds(Collection ids) { + OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + return getGradeMapper().deleteByIds(ids); + } + + + @Override + public Map getSearchCondition(Map params) { + Map apiDatas = new HashMap<>(); + List addGroups = new ArrayList<>(); + List conditionItems = new ArrayList<>(); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "等级方案", "161", "schemeId", true, "schemeBrowser"); + SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "gradeName"); + conditionItems.add(browserItem); + conditionItems.add(gradeNameCondition); + addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); + apiDatas.put("conditions", addGroups); + return apiDatas; + } + + + @Override + public Map getGradeForm(Map params) { + Map apiDatas = new HashMap<>(); + List selectItems = new ArrayList<>(); + List addGroups = new ArrayList<>(); + SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "gradeName"); + gradeNameCondition.setRules("required|string"); + SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo"); + gradeNoCondition.setRules("required|string"); + SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", true, "schemeBrowser"); + + // 编辑状态下赋值操作 + String id = Util.null2String(params.get("id")); + if (!StringUtil.isEmpty(id)) { + GradePO gradePO = getGradeMapper().getGradeByID(Integer.parseInt(id)); + OrganizationAssert.notNull(gradePO, "选择的数据不存在，或数据已删除"); + + gradeNameCondition.setValue(gradePO.getGradeName()); + gradeNoCondition.setValue(gradePO.getGradeNo()); + descriptionCondition.setValue(gradePO.getDescription()); + browserItem.setValue(gradePO.getSchemeId()); + // 编辑状态下,编号只读 + gradeNoCondition.setViewAttr(1); + } + + selectItems.add(gradeNoCondition); + selectItems.add(gradeNameCondition); + selectItems.add(descriptionCondition); + selectItems.add(browserItem); + addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); + apiDatas.put("condition", addGroups); + return apiDatas; + } + + @Override + public Map getTableBtn() { + return MenuBtn.getCommonBtnDatas(); + } + + @Override + public Map getTabInfo() { + Map apiDatas = new HashMap<>(); + List topTabs = new ArrayList<>(); + topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build()); + topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build()); + topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build()); + apiDatas.put("topTabs", topTabs); + + HashMap countMap = new HashMap<>(); + countMap.put("flowAll", getGradeMapper().getCountByTag(-1)); + countMap.put("enable", getGradeMapper().getCountByTag(0)); + countMap.put("disable", getGradeMapper().getCountByTag(1)); + + apiDatas.put("topTabCount", countMap); + return apiDatas; + } + + /** + * 查询条件 + * + * @param params + * @return + */ + private String buildSqlWhere(Map params) { + DBType dbType = DBType.get(new RecordSet().getDBType()); + String sqlWhere = " where t.delete_type ='0' "; + String gradeName = (String) params.get("gradeName"); + if (StringUtils.isNotBlank(gradeName)) { + sqlWhere += " AND t.grade_name " + dbType.like(gradeName); + } + String schemeId = (String) params.get("schemeId"); + if (StringUtils.isNotBlank(schemeId)) { + sqlWhere += " AND t.scheme_id " + dbType.like(schemeId); + } + String viewCondition = (String) params.get("viewcondition"); + // -1:全部、0:启用、1:禁用 + if (StringUtils.isNotBlank(viewCondition) && !"-1".equalsIgnoreCase(viewCondition)) { + sqlWhere += " AND t.forbidden_tag = '" + schemeId + "'"; + } + return sqlWhere; + } +} diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 74b5a5d9..6328a658 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -17,7 +17,6 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; -import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; @@ -32,7 +31,6 @@ import java.util.*; * @createTime: 2022/05/10 * @version: 1.0 */ -@WeaIocService public class LevelServiceImpl extends Service implements LevelService { private LevelMapper getLevelMapper() { @@ -135,7 +133,7 @@ public class LevelServiceImpl extends Service implements LevelService { } @Override - public Map getTableInfo() { + public Map getTabInfo() { Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build()); diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index b3b35ccd..3eac99ef 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -16,7 +16,6 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; -import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; @@ -30,8 +29,6 @@ import java.util.*; * @Date 2022/5/9 * @Version V1.0 **/ -@WeaIocService - public class SchemeServiceImpl extends Service implements SchemeService { private SchemeMapper getSchemeMapper() { diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index 25d15a89..48b6aad3 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -194,10 +194,10 @@ public class LevelController { @GET @Path("/getTabInfo") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getTableInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).getTableInfo()); + return ReturnResult.successed(getLevelWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java new file mode 100644 index 00000000..3f441c0e --- /dev/null +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -0,0 +1,111 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.entity.scheme.param.LevelSearchParam; +import com.engine.organization.service.LevelService; +import com.engine.organization.service.impl.LevelServiceImpl; +import org.apache.ibatis.annotations.Param; +import weaver.hrm.User; + +import java.util.Collection; +import java.util.Map; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/10 + * @version: 1.0 + */ +public class GradeWrapper extends Service { + private LevelService getLevelService(User user) { + return ServiceUtil.getService(LevelServiceImpl.class, user); + } + + /** + * 职等列表 + * + * @param params + * @return + */ + public Map listPage(Map params) { + return getLevelService(user).listPage(params); + } + + /** + * 新增职等 + * + * @param param + * @return + */ + public int saveLevel(LevelSearchParam param) { + return getLevelService(user).saveLevel(param); + } + + /** + * 更新职等 + * + * @param param + * @return + */ + public int updateLevel(LevelSearchParam param) { + return getLevelService(user).updateLevel(param); + } + + /** + * 更新禁用标记 + * + * @param params + */ + public int updateForbiddenTagById(LevelSearchParam params) { + return getLevelService(user).updateForbiddenTagById(params); + } + + /** + * 根据ID批量删除 + * + * @param ids + */ + public int deleteByIds(@Param("ids") Collection ids) { + return getLevelService(user).deleteByIds(ids); + } + + /** + * 获取搜索条件 + * + * @param params + * @return + */ + public Map getSearchCondition(Map params) { + return getLevelService(user).getSearchCondition(params); + } + + + /** + * 获取新增表单 + * + * @param params + * @return + */ + public Map getLevelForm(Map params) { + return getLevelService(user).getLevelForm(params); + } + + /** + * 获取列表页面按钮信息 + * + * @return + */ + public Map getTableBtn() { + return getLevelService(user).getTableBtn(); + } + + /** + * 获取列表tabs + * + * @return + */ + public Map getTabInfo() { + return getLevelService(user).getTabInfo(); + } +} diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index fa351099..bfe46899 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -105,7 +105,7 @@ public class LevelWrapper extends Service { * * @return */ - public Map getTableInfo() { - return getLevelService(user).getTableInfo(); + public Map getTabInfo() { + return getLevelService(user).getTabInfo(); } }