From 6bfc6eae275bf6f8bcfe3d5b696143272eca5b3c Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 26 Aug 2022 15:27:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmresource/vo/ResourceBasicInfoVO.java | 11 ++++++--- .../hrmresource/ResourceBasicInfoMapper.java | 4 +++- .../hrmresource/ResourceBasicInfoMapper.xml | 24 ++++++++++++------- .../impl/ResourceBasicInfoServiceImpl.java | 10 ++++---- .../engine/organization/util/ConfigTrans.java | 14 +++++++++++ 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java index 698adc08..abf878d6 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java @@ -1,6 +1,7 @@ package com.engine.organization.entity.hrmresource.vo; import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OperatePopedom; import com.engine.organization.annotation.OrganizationTable; import com.engine.organization.annotation.OrganizationTableColumn; import com.engine.organization.annotation.OrganizationTableOperate; @@ -29,13 +30,17 @@ import lombok.NoArgsConstructor; fromSql = "FROM jcl_org_item t ", orderby = "fno", sortway = "asc", - primarykey = "id", + primarykey = "fid", operates = { @OrganizationTableOperate(index = "0", text = "编辑"), @OrganizationTableOperate(index = "1", text = "删除"), @OrganizationTableOperate(index = "2", text = "恢复") }, - tableType = WeaTableType.CHECKBOX + tableType = WeaTableType.CHECKBOX, + operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatResourceOperates", otherpara = "column:fdelete" + ) + + ) public class ResourceBasicInfoVO { @@ -43,7 +48,7 @@ public class ResourceBasicInfoVO { * 主键 */ @OrganizationTableColumn(column = "fid", display = false) - private Integer id; + private Integer fId; /** diff --git a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java index e91833fd..a12a8c3e 100644 --- a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java @@ -33,7 +33,9 @@ public interface ResourceBasicInfoMapper { int recoverByIds(@Param("ids")Collection ids); - List selectItemByFNo(@Param("fno")String fno); + List selectItemByFNo(@Param("fno")String fno,@Param("fclassid")Integer fclassid); int insertIgnoreNull(ResourceItemPO resourceItemPO); + + int update(ResourceItemPO resourceItemPO); } diff --git a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml index 4fedb574..8825c0e2 100644 --- a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml @@ -12,8 +12,8 @@ - - + + select fid,fclassid,fno,fname,fmemo,fdelete,creator,create_time,update_time from jcl_org_item - where fdelete = 0 - AND fno = #{fno} + where fno = #{fno} + and fclassid = #{fclassid} @@ -81,8 +81,8 @@ - + INSERT INTO jcl_org_item @@ -143,5 +143,13 @@ - + + update jcl_org_item + + fname=#{fname}, + fmemo=#{fmemo}, + update_time=#{updateTime}, + + WHERE fid = #{fid} AND fdelete = 0 + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java index e8464ba6..1c18f783 100644 --- a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java @@ -80,13 +80,13 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas @Override public List getForm(Map params) { - String id = Util.null2String(params.get("id")); + String id = Util.null2String(params.get("fid")); String fClassId = Util.null2String(params.get("fclassid")); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); SearchConditionItem resourceTypeItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "类型", "161", "fclassid", "resourceTypeBrowser"); resourceTypeItem.setRules("required|string"); - if (StringUtils.isNotBlank(fClassId)) { + if (StringUtils.isNotBlank(fClassId) && !"-1".equals(fClassId)) { BrowserBean browserBean = resourceTypeItem.getBrowserConditionParam(); List> maps = getResourceBasicInfoMapper().browserDatas(DeleteParam.builder().ids(fClassId).build().getIds()); browserBean.setReplaceDatas(maps); @@ -135,19 +135,19 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas @Override public int save(ResourceItemPO resourceItemPO) { - List list = getResourceBasicInfoMapper().selectItemByFNo(resourceItemPO.getFno()); + List list = getResourceBasicInfoMapper().selectItemByFNo(resourceItemPO.getFno(),resourceItemPO.getFclassid()); OrganizationAssert.isEmpty(list,"编号不允许重复"); return getResourceBasicInfoMapper().insertIgnoreNull(resourceItemPO); } @Override public ResourceItemPO selectById(Integer fid) { - return null; + return getResourceBasicInfoMapper().getResourceItemByFid(fid); } @Override public int update(ResourceItemPO resourceItemPO) { - return 0; + return getResourceBasicInfoMapper().update(resourceItemPO); } private String buildSqlWhere(Map params) { diff --git a/src/com/engine/organization/util/ConfigTrans.java b/src/com/engine/organization/util/ConfigTrans.java index 0efbc1b9..a520f459 100644 --- a/src/com/engine/organization/util/ConfigTrans.java +++ b/src/com/engine/organization/util/ConfigTrans.java @@ -42,4 +42,18 @@ public class ConfigTrans { return list; } + public static List formatResourceOperates(String id,String isDefault) { + List list = Lists.newArrayList(); + if ("0".equals(isDefault)) { + list.add(true); + list.add(true); + list.add(false); + } else { + list.add(false); + list.add(false); + list.add(true); + } + return list; + } + }