From b2fd60a9bc37553fe9edc395d8a1417d6ae0b8e2 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 17 May 2022 16:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/mapper/post/PostInfoMapper.xml | 2 +- .../engine/organization/service/GroupService.java | 10 ++++++++++ .../service/impl/GroupServiceImpl.java | 14 +++++++++++++- src/com/engine/organization/util/MenuBtn.java | 8 ++++---- .../engine/organization/web/GroupController.java | 14 ++++++++++++++ .../engine/organization/wrapper/GroupWrapper.java | 10 ++++++++++ 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.xml b/src/com/engine/organization/mapper/post/PostInfoMapper.xml index 9d4a6011..be162ff4 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.xml +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.xml @@ -154,7 +154,7 @@ - + update jcl_org_post_info forbidden_tag=#{forbiddenTag}, diff --git a/src/com/engine/organization/service/GroupService.java b/src/com/engine/organization/service/GroupService.java index fb704c21..fc02bf8e 100644 --- a/src/com/engine/organization/service/GroupService.java +++ b/src/com/engine/organization/service/GroupService.java @@ -17,14 +17,24 @@ public interface GroupService { */ Map getGroupFormField(Map params); + /** + * 更新 + * + * @param params + * @return + */ + boolean updateGroup(Map params); + /** * 获取列表页面按钮信息 + * * @return */ Map getHasRight(); /** * 获取列表tabs + * * @return */ Map getTabInfo(); diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index fb431936..d2f6d85b 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -6,6 +6,7 @@ import com.engine.core.impl.Service; import com.engine.organization.entity.TopTab; import com.engine.organization.service.GroupService; import com.engine.organization.util.MenuBtn; +import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; @@ -37,7 +38,6 @@ public class GroupServiceImpl extends Service implements GroupService { String id = Util.null2String(params.get("id")); if (!StringUtil.isEmpty(id)) { RecordSet rs = new RecordSet(); - String sql = "select * from HrmCompany where id in(" + id + ")"; rs.executeQuery(sql); rs.executeQuery(sql); @@ -71,6 +71,18 @@ public class GroupServiceImpl extends Service implements GroupService { return apiDatas; } + @Override + public boolean updateGroup(Map params) { + String id = Util.null2String(params.get("id")); + OrganizationAssert.notNull(id, "数据有误"); + String companyname = (String) params.get("companyname"); + String companydesc = (String) params.get("companydesc"); + String companyweb = (String) params.get("companyweb"); + RecordSet rs = new RecordSet(); + return rs.executeUpdate("update HrmCompany set COMPANYNAME = ?,COMPANYDESC=?,COMPANYWEB=? where id = ?", companyname, companydesc, companyweb, id); + + } + @Override public Map getHasRight() { Map btnDatas = new HashMap<>(); diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index ac273b73..b8870502 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -33,7 +33,7 @@ public class MenuBtn { * @return */ public static MenuBtn topMenu_addNew() { - return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建").type("BTN_Addnew").build(); + return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build(); } /** @@ -51,7 +51,7 @@ public class MenuBtn { * @return */ public static MenuBtn rightMenu_addNew() { - return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建").type("BTN_Addnew").build(); + return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build(); } /** @@ -80,12 +80,12 @@ public class MenuBtn { Map btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); - // 新建 + // 新增 topMenuList.add(MenuBtn.topMenu_addNew()); // 批量删除 topMenuList.add(MenuBtn.topMenu_batchDelete()); btnDatas.put("topMenu", topMenuList); - // 新建 + // 新增 rightMenuList.add(MenuBtn.rightMenu_addNew()); // 日志 rightMenuList.add(MenuBtn.rightMenu_btnLog()); diff --git a/src/com/engine/organization/web/GroupController.java b/src/com/engine/organization/web/GroupController.java index 8a4abdf4..be6a5b9e 100644 --- a/src/com/engine/organization/web/GroupController.java +++ b/src/com/engine/organization/web/GroupController.java @@ -4,12 +4,14 @@ import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.GroupWrapper; +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; @@ -47,6 +49,18 @@ public class GroupController { } } + @POST + @Path("/updateGroup") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult updateGroup(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map map) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getGroupWrapper(user).updateGroup(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + /** * 列表页顶部按钮 * diff --git a/src/com/engine/organization/wrapper/GroupWrapper.java b/src/com/engine/organization/wrapper/GroupWrapper.java index 2c9bd5c0..f56a4a86 100644 --- a/src/com/engine/organization/wrapper/GroupWrapper.java +++ b/src/com/engine/organization/wrapper/GroupWrapper.java @@ -30,6 +30,16 @@ public class GroupWrapper extends Service { return getGroupService(user).getGroupFormField(params); } + /** + * 更新 + * + * @param params + * @return + */ + public boolean updateGroup(Map params) { + return getGroupService(user).updateGroup(params); + } + /** * 获取列表页面按钮信息 *