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

职级接口 职等搜索条件修复

This commit is contained in:
dxfeng 2022-05-11 18:27:52 +08:00
parent 542de843fb
commit 0dea1b6ae4
9 changed files with 266 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/api/organization/web/GradeController.java Normal file
View File

@ -0,0 +1,14 @@
package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0
*/
@Path("/bs/hrmorganization/grade")
public class GradeController extends com.engine.organization.web.GradeController {
}

11
src/com/engine/organization/entity/TopTab.java
View File

@ -21,15 +21,4 @@ public class TopTab {
private Boolean showcount;
private String title;
private String viewCondition;
@Override
public String toString() {
return "TopTab{" +
"color='" + color + '\'' +
", groupid='" + groupId + '\'' +
", showcount='" + showcount + '\'' +
", title='" + title + '\'' +
", viewcondition='" + viewCondition + '\'' +
'}';
}
}

4
src/com/engine/organization/mapper/scheme/GradeMapper.java
View File

@ -24,14 +24,14 @@ public interface GradeMapper {
List<GradePO> listByNo(@Param("gradeNo") String gradeNo);
/**
* 获取职等根据ID
* 获取职级根据ID
* @param id
* @return
*/
GradePO getGradeByID(@Param("id") long id);
/**
* 插入职等
* 插入职级
* @param gradePO
* @return
*/

8
src/com/engine/organization/service/GradeService.java
View File

@ -13,7 +13,7 @@ import java.util.Map;
*/
public interface GradeService {
/**
* 职等列表
* 职级列表
*
* @param params
* @return
@ -21,14 +21,14 @@ public interface GradeService {
Map<String, Object> listPage(Map<String, Object> params);
/**
* 新增职等
* 新增职级
* @param param
* @return
*/
int saveGrade(GradeSearchParam param);
/**
* 更新职等信息
* 更新职级信息
*
* @param param
* @return
@ -70,7 +70,7 @@ public interface GradeService {
* 获取列表页面按钮信息
* @return
*/
Map<String, Object> getTableBtn();
Map<String, Object> getHasRight();
/**
* 获取列表tabs

14
src/com/engine/organization/service/impl/GradeServiceImpl.java
View File

@ -54,7 +54,6 @@ public class GradeServiceImpl extends Service implements GradeService {
List<GradePO> 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);
}
@ -82,7 +81,7 @@ public class GradeServiceImpl extends Service implements GradeService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> conditionItems = new ArrayList<>();
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "等级方案", "161", "schemeId", true, "schemeBrowser");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "gradeName");
conditionItems.add(browserItem);
conditionItems.add(gradeNameCondition);
@ -102,7 +101,8 @@ public class GradeServiceImpl extends Service implements GradeService {
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");
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "161", "levelId", "levelBrowser");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
@ -113,7 +113,8 @@ public class GradeServiceImpl extends Service implements GradeService {
gradeNameCondition.setValue(gradePO.getGradeName());
gradeNoCondition.setValue(gradePO.getGradeNo());
descriptionCondition.setValue(gradePO.getDescription());
browserItem.setValue(gradePO.getSchemeId());
schemeBrowserItem.setValue(gradePO.getSchemeId());
levelBrowserItem.setValue(gradePO.getLevelId());
// 编辑状态下,编号只读
gradeNoCondition.setViewAttr(1);
}
@ -121,14 +122,15 @@ public class GradeServiceImpl extends Service implements GradeService {
selectItems.add(gradeNoCondition);
selectItems.add(gradeNameCondition);
selectItems.add(descriptionCondition);
selectItems.add(browserItem);
selectItems.add(schemeBrowserItem);
selectItems.add(levelBrowserItem);
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
apiDatas.put("condition", addGroups);
return apiDatas;
}
@Override
public Map<String, Object> getTableBtn() {
public Map<String, Object> getHasRight() {
return MenuBtn.getCommonBtnDatas();
}

5
src/com/engine/organization/service/impl/LevelServiceImpl.java
View File

@ -54,7 +54,6 @@ public class LevelServiceImpl extends Service implements LevelService {
List<LevelPO> list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID());
System.out.println(levelPO);
return getLevelMapper().insertIgnoreNull(levelPO);
}
@ -82,7 +81,7 @@ public class LevelServiceImpl extends Service implements LevelService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> conditionItems = new ArrayList<>();
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "等级方案", "161", "schemeId", true, "schemeBrowser");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "levelName");
conditionItems.add(browserItem);
conditionItems.add(levelNameCondition);
@ -102,7 +101,7 @@ public class LevelServiceImpl extends Service implements LevelService {
SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
levelNoCondition.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");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));

11
src/com/engine/organization/util/OrganizationFormItemUtil.java
View File

@ -128,12 +128,11 @@ public class OrganizationFormItemUtil {
* @param label
* @param type
* @param name
* @param iscustom 是否为自定义浏览按钮
* @param fieldDbType 数据展现集成标识
* @return
*/
public static SearchConditionItem browserItem(User user, int colSpan, int fieldcol,
int viewAttr, boolean isQuickSearch, String label, String type, String name, Boolean iscustom, String fieldDbType) {
int viewAttr, boolean isQuickSearch, String label, String type, String name, String fieldDbType) {
ConditionFactory conditionFactory = new ConditionFactory(user);
SearchConditionItem browser = conditionFactory.createCondition(ConditionType.BROWSER, 502327, name, type);
browser.setColSpan(colSpan);
@ -141,7 +140,7 @@ public class OrganizationFormItemUtil {
browser.setViewAttr(viewAttr);
browser.setIsQuickSearch(isQuickSearch);
browser.setLabel(label);
if (iscustom) {
if ("161".equals(type) || "162".equals(type)) {
fieldDbType = "browser." + fieldDbType;
BrowserBean browserBean = new BrowserBean();
// completeParams
@ -175,6 +174,12 @@ public class OrganizationFormItemUtil {
browserBean.setType(type);
browser.setBrowserConditionParam(browserBean);
if ("162".equals(type)) {
HashMap<String, Object> otherMap = new HashMap<>();
otherMap.put("isMultCheckbox", "true");
otherMap.put("icon", "icon-coms-integration");
browser.setOtherParams(otherMap);
}
}
return browser;
}

205
src/com/engine/organization/web/GradeController.java Normal file
View File

@ -0,0 +1,205 @@
package com.engine.organization.web;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.scheme.param.GradeSearchParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.GradeWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.Map;
/**
* @description: TODO
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0
*/
public class GradeController {
public GradeWrapper getGradeWrapper(User user) {
return ServiceUtil.getService(GradeWrapper.class, user);
}
/**
* 获取list列表
*
* @param request
* @param response
* @return
*/
@GET
@Path("/getGradeTable")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult listGrade(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(getGradeWrapper(user).listPage(map));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 添加职级
*
* @param request
* @param response
* @return
*/
@POST
@Path("/saveGrade")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult saveGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).saveGrade(param));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 更新职级，修改所有字段
*
* @param request
* @param response
* @param param
* @return
*/
@POST
@Path("/updateGrade")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult updateGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).updateGrade(param));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 更新禁用标记
*
* @param request
* @param response
* @param param
* @return
*/
@POST
@Path("/updateForbiddenTagById")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).updateForbiddenTagById(param));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 根据ID批量删除数据
*
* @param request
* @param response
* @param param
* @return
*/
@POST
@Path("/deleteByIds")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).deleteByIds(param.getIds()));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 高级搜索条件
*
* @param request
* @param response
* @return
*/
@GET
@Path("/getSearchCondition")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(getGradeWrapper(user).getSearchCondition(map));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 新增、编辑表单
*
* @param request
* @param response
* @return
*/
@GET
@Path("/getGradeForm")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getGradeForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(getGradeWrapper(user).getGradeForm(map));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
/**
* 列表页顶部按钮
*
* @param request
* @param response
* @return
*/
@GET
@Path("/getHasRight")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).getHasRight());
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
@GET
@Path("/getTabInfo")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getGradeWrapper(user).getTabInfo());
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
}
}

46
src/com/engine/organization/wrapper/GradeWrapper.java
View File

@ -2,9 +2,9 @@ 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 com.engine.organization.entity.scheme.param.GradeSearchParam;
import com.engine.organization.service.GradeService;
import com.engine.organization.service.impl.GradeServiceImpl;
import org.apache.ibatis.annotations.Param;
import weaver.hrm.User;
@ -14,42 +14,42 @@ import java.util.Map;
/**
* @description: TODO
* @author:dxfeng
* @createTime: 2022/05/10
* @createTime: 2022/05/11
* @version: 1.0
*/
public class GradeWrapper extends Service {
private LevelService getLevelService(User user) {
return ServiceUtil.getService(LevelServiceImpl.class, user);
private GradeService getGradeService(User user) {
return ServiceUtil.getService(GradeServiceImpl.class, user);
}
/**
* 职等列表
* 职级列表
*
* @param params
* @return
*/
public Map<String, Object> listPage(Map<String, Object> params) {
return getLevelService(user).listPage(params);
return getGradeService(user).listPage(params);
}
/**
* 新增职等
* 新增职级
*
* @param param
* @return
*/
public int saveLevel(LevelSearchParam param) {
return getLevelService(user).saveLevel(param);
public int saveGrade(GradeSearchParam param) {
return getGradeService(user).saveGrade(param);
}
/**
* 更新职等
* 更新职级
*
* @param param
* @return
*/
public int updateLevel(LevelSearchParam param) {
return getLevelService(user).updateLevel(param);
public int updateGrade(GradeSearchParam param) {
return getGradeService(user).updateGrade(param);
}
/**
@ -57,8 +57,8 @@ public class GradeWrapper extends Service {
*
* @param params
*/
public int updateForbiddenTagById(LevelSearchParam params) {
return getLevelService(user).updateForbiddenTagById(params);
public int updateForbiddenTagById(GradeSearchParam params) {
return getGradeService(user).updateForbiddenTagById(params);
}
/**
@ -67,7 +67,7 @@ public class GradeWrapper extends Service {
* @param ids
*/
public int deleteByIds(@Param("ids") Collection<Long> ids) {
return getLevelService(user).deleteByIds(ids);
return getGradeService(user).deleteByIds(ids);
}
/**
@ -77,7 +77,7 @@ public class GradeWrapper extends Service {
* @return
*/
public Map<String, Object> getSearchCondition(Map<String, Object> params) {
return getLevelService(user).getSearchCondition(params);
return getGradeService(user).getSearchCondition(params);
}
@ -87,8 +87,8 @@ public class GradeWrapper extends Service {
* @param params
* @return
*/
public Map<String, Object> getLevelForm(Map<String, Object> params) {
return getLevelService(user).getLevelForm(params);
public Map<String, Object> getGradeForm(Map<String, Object> params) {
return getGradeService(user).getGradeForm(params);
}
/**
@ -96,8 +96,8 @@ public class GradeWrapper extends Service {
*
* @return
*/
public Map<String, Object> getTableBtn() {
return getLevelService(user).getTableBtn();
public Map<String, Object> getHasRight() {
return getGradeService(user).getHasRight();
}
/**
@ -106,6 +106,6 @@ public class GradeWrapper extends Service {
* @return
*/
public Map<String, Object> getTabInfo() {
return getLevelService(user).getTabInfo();
return getGradeService(user).getTabInfo();
}
}