From dc347c755d4a350d83e1ce380188d41bf6cd0331 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 8 Nov 2022 09:23:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personnelcard/CardAccessMapper.java | 6 ++- .../mapper/personnelcard/CardAccessMapper.xml | 49 +++++++++++++------ .../service/CardAccessService.java | 40 +++++++++++++++ .../service/impl/CardAccessServiceImpl.java | 43 ++++++++++++++-- 4 files changed, 119 insertions(+), 19 deletions(-) diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java index 167e3844..77719953 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java +++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java @@ -5,7 +5,9 @@ import com.engine.organization.entity.personnelcard.po.CardAccessPO; import org.apache.ibatis.annotations.Param; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -17,9 +19,11 @@ public interface CardAccessMapper { int insertIgnoreNull(CardAccessPO cardAccessPO); - int updateCardAccess(CardAccessPO cardAccessPO); + int saveCardAccess(@Param("dataList") List> dataList); int deleteByIds(@Param("ids") Collection ids); ManagerDetachPO selectById(@Param("id") Integer id); + + int updateTabName(@Param("name")String name,@Param("id") Integer id); } diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml index f7f00d9a..43336a70 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml @@ -187,21 +187,35 @@ - - update jcl_org_cardaccess - - type_id=#{typeId}, - type_name=#{typeName}, - status=#{status}, - all_people=#{allPeople}, - all_superior=#{allSuperior}, - custom=#{custom}, - update_time=#{updateTime}, - - WHERE id = #{id} AND delete_type = 0 - + + + update jcl_org_cardaccess + + + status = #{item.status}, + + + all_people = #{item.allPeople}, + + + superior = #{item.superior}, + + + all_superior = #{item.allSuperior}, + + + custom = #{item.custom}, + + + update_time = #{item.updateTime} + + + where id = #{item.id} + + + UPDATE jcl_org_cardaccess SET delete_type = 1 @@ -214,7 +228,6 @@ - + + + + + UPDATE jcl_org_cardaccess + SET type_name = #{name} + WHERE id = #{id} + \ No newline at end of file diff --git a/src/com/engine/organization/service/CardAccessService.java b/src/com/engine/organization/service/CardAccessService.java index 521df12f..4f7b5890 100644 --- a/src/com/engine/organization/service/CardAccessService.java +++ b/src/com/engine/organization/service/CardAccessService.java @@ -1,5 +1,8 @@ package com.engine.organization.service; +import com.engine.organization.entity.personnelcard.po.CardAccessPO; + +import java.util.Collection; import java.util.Map; /** @@ -10,9 +13,46 @@ import java.util.Map; **/ public interface CardAccessService { + /** + * 列表接口 + * @return + */ Map tablePage(); + /** + * 页面权限 + * @return + */ Map hasRight(); + /** + * 列表保存 + * @param params + * @return + */ int save(Map params); + + + /** + * 删除 + * @param ids + * @return + */ + int deleteByIds(Collection ids); + + /** + * 新增 + * @param cardAccessPO + * @return + */ + int addData(CardAccessPO cardAccessPO); + + /** + * 更新tab名称 + * @param name + * @param id + * @return + */ + int updateTabName(String name,Integer id); + } diff --git a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java index 99f1dee2..9464e517 100644 --- a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java +++ b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java @@ -4,11 +4,15 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.detach.vo.ManagerDetachVO; +import com.engine.organization.entity.personnelcard.po.CardAccessPO; +import com.engine.organization.mapper.personnelcard.CardAccessMapper; import com.engine.organization.service.CardAccessService; import com.engine.organization.util.HasRightUtil; +import com.engine.organization.util.db.MapperProxyFactory; +import weaver.general.Util; -import java.util.HashMap; -import java.util.Map; + +import java.util.*; /** * @Author weaver_cl @@ -20,6 +24,10 @@ public class CardAccessServiceImpl extends Service implements CardAccessService private static final String RIGHT_NAME = "CardAccess:All"; + private CardAccessMapper getCardAccessMapper() { + return MapperProxyFactory.getProxy(CardAccessMapper.class); + } + @Override public Map tablePage() { Map resultMap = new HashMap<>(); @@ -44,8 +52,35 @@ public class CardAccessServiceImpl extends Service implements CardAccessService @Override public int save(Map params) { - - return 0; + int rowNum = Util.getIntValue((String) params.get("rownum")); + List> dataList = new ArrayList<>(); + for (int i = 0; i < rowNum; i++) { + HashMap data = new HashMap<>(); + data.put("id",params.get("id_"+i)); + data.put("status",params.get("status_"+i)); + data.put("allPeople",params.get("all_people_"+i)); + data.put("superior",params.get("superior_"+i)); + data.put("allSuperior",params.get("all_superior_"+i)); + data.put("custom",params.get("custom"+i)); + data.put("updateTime",new Date()); + dataList.add(data); + } + return getCardAccessMapper().saveCardAccess(dataList); + } + + @Override + public int deleteByIds(Collection ids) { + return getCardAccessMapper().deleteByIds(ids); + } + + @Override + public int addData(CardAccessPO cardAccessPO) { + return getCardAccessMapper().insertIgnoreNull(cardAccessPO); + } + + @Override + public int updateTabName(String name,Integer id) { + return getCardAccessMapper().updateTabName(name,id); } From a82a41bf64b22b9a137fc08babacfb7d28953cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98ml=E2=80=99?= Date: Tue, 8 Nov 2022 15:17:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=9B=BE=E8=99=9A=E6=8B=9F=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/modeexpand/VODeleteModeExpand.java | 10 ++++++---- .../formmode/organization/modeexpand/VOModeExpand.java | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/weaver/formmode/organization/modeexpand/VODeleteModeExpand.java b/src/weaver/formmode/organization/modeexpand/VODeleteModeExpand.java index 3e4a46e3..e99a02ee 100644 --- a/src/weaver/formmode/organization/modeexpand/VODeleteModeExpand.java +++ b/src/weaver/formmode/organization/modeexpand/VODeleteModeExpand.java @@ -17,7 +17,7 @@ import java.util.Map; public class VODeleteModeExpand extends AbstractModeExpandJavaCodeNew { public Map doModeExpand(Map param) { - Map result = new HashMap(); + Map result = new HashMap(); try { User user = (User) param.get("user"); int billid = -1;//数据id @@ -31,12 +31,14 @@ public class VODeleteModeExpand extends AbstractModeExpandJavaCodeNew { String billids = (String) param.get("CheckedCheckboxIds"); String[] billidsTmp = billids.split(","); String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + RecordSet rs = new RecordSet(); + int st = 500000000; for (String id : billidsTmp) { - RecordSet rs = new RecordSet(); - String delsql = "delete JCL_ORG_MAP where id=" + id + " and fisvitual='1'"; + int nid = Integer.parseInt(id) + st; + String delsql = "delete from JCL_ORG_MAP where id=" + nid + " and fisvitual='1'"; rs.execute(delsql); String updatesql = "update JCL_ORG_MAP set fdateend='" + new Date(OrganizationDateUtil.stringToDate(currentDate).getTime()) + - "' where id=" + id + " and fisvitual='1'"; + "' where id=" + nid + " and fisvitual='1'"; rs.execute(updatesql); } } diff --git a/src/weaver/formmode/organization/modeexpand/VOModeExpand.java b/src/weaver/formmode/organization/modeexpand/VOModeExpand.java index adde8c2a..8f586888 100644 --- a/src/weaver/formmode/organization/modeexpand/VOModeExpand.java +++ b/src/weaver/formmode/organization/modeexpand/VOModeExpand.java @@ -41,6 +41,7 @@ public class VOModeExpand extends AbstractModeExpandJavaCodeNew { RecordSet recordSet = new RecordSet(); recordSet.executeQuery("select id, fid, fecid, fname, ftype, forder, fparentid, fdate from uf_jcl_org_vir where fid = '" + fid + "'"); JclOrgMap jclOrgMap = new JclOrgMap(); + int st = 500000000; if (recordSet.next()) { Integer ftype = Integer.valueOf(recordSet.getString("ftype")); jclOrgMap.setFType(ftype); @@ -50,7 +51,7 @@ public class VOModeExpand extends AbstractModeExpandJavaCodeNew { jclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(recordSet.getString("fdate")).getTime())); jclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); jclOrgMap.setFNumber(String.valueOf(modeid));//模块的数据编号 - jclOrgMap.setId(Integer.valueOf(recordSet.getString("id"))); + jclOrgMap.setId(Integer.valueOf(recordSet.getString("id")) + st); jclOrgMap.setFName(recordSet.getString("fname")); if (!"".equals(recordSet.getString("fparentid"))) { jclOrgMap.setFParentId(Integer.valueOf(recordSet.getString("fparentid"))); @@ -65,9 +66,10 @@ public class VOModeExpand extends AbstractModeExpandJavaCodeNew { } } } + // 编辑修改 if (iscreate.equals("2")) { RecordSet rs = new RecordSet(); - String delsql = "delete JCL_ORG_MAP where id=" + jclOrgMap.getId() + " and ftype='" + jclOrgMap.getFType() + "' and fisvitual='1' and fdatebegin='" + jclOrgMap.getFDateBegin() + "'"; + String delsql = "delete from JCL_ORG_MAP where id=" + jclOrgMap.getId() + " and ftype='" + jclOrgMap.getFType() + "' and fisvitual='1' and fdatebegin='" + jclOrgMap.getFDateBegin() + "'"; rs.execute(delsql); String updatesql = "update JCL_ORG_MAP set fdateend='" + jclOrgMap.getFDateBegin() + "' where id=" + jclOrgMap.getId() + " and ftype='" + jclOrgMap.getFType() + "' and fisvitual='1' and fdateend > '" + jclOrgMap.getFDateBegin() + "'"; rs.execute(updatesql);