From 6c31bce4e70138fd620a7ab380276cb32557eb2c Mon Sep 17 00:00:00 2001 From: zhouxy Date: Mon, 26 Jan 2026 16:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E5=9C=B0=E5=8C=BA=E7=BB=8F=E8=90=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B8=BB=E4=BD=93=E6=95=B0=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=8F=AA=E7=BB=9F=E8=AE=A1=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TSTaskListServiceImpl.java | 27 +++--- .../chinaweal/aiccs/org/entity/OrgUnits.java | 84 ++++--------------- .../aiccs/business/TSTaskListMapper.xml | 11 ++- 3 files changed, 39 insertions(+), 83 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java index def9279..363f65c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java @@ -764,22 +764,23 @@ public class TSTaskListServiceImpl extends BaseServiceImpl orgList = aicorgMapper.selectList(new LambdaQueryWrapper() + .eq(OrgUnits::getParentId, aicUser.getOrgID()) + .eq(OrgUnits::getDeleted, "0") + .eq(OrgUnits::getUnitType, "1")); + //提取出机构ID + List orgUnitIds = orgList.stream() + .map(OrgUnits::getOrgNumber) + .collect(Collectors.toList()); + orgUnitIds.add(0, aicUser.getRegionID()); // 在索引0位置插入当前用户的regionID + customParamMap.put("orgList", orgUnitIds); + + List abnEntLocStatistic = baseMapper.tsAbnEntLocStatistic(customParamMap); + //处理机构名称 Map params = new HashMap<>(); params.put("deleted", "0"); params.put("unittype", "1"); - params.put("orgNumber", aicUser.getRegionID()); - OrgUnits org = aicorgMapper.queryByOrgNumberMap(params); - Integer orgLevel = org.getOrgLevel(); - //根据机构等级判断 - if (orgLevel == 1) { //省局 - customParamMap.put("orgNumber", StringUtils.substring(aicUser.getRegionID(), 0, 2)+"%"); - } else if (orgLevel == 2) { //市局 - customParamMap.put("orgNumber", StringUtils.substring(aicUser.getRegionID(), 0, 4)+"%"); - } else if (orgLevel >= 3) { //区局 - customParamMap.put("orgNumber", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); - } - List abnEntLocStatistic = baseMapper.tsAbnEntLocStatistic(customParamMap); - //处理机构名称 + params.put("parentID", aicUser.getOrgID()); for (AbnEntLocStatistic item : abnEntLocStatistic){ params.put("orgNumber", item.getOrgNumber()); OrgUnits orgUnits = aicorgMapper.queryByOrgNumberMap(params); diff --git a/src/main/java/com/chinaweal/aiccs/org/entity/OrgUnits.java b/src/main/java/com/chinaweal/aiccs/org/entity/OrgUnits.java index 8131040..964410d 100644 --- a/src/main/java/com/chinaweal/aiccs/org/entity/OrgUnits.java +++ b/src/main/java/com/chinaweal/aiccs/org/entity/OrgUnits.java @@ -2,31 +2,42 @@ package com.chinaweal.aiccs.org.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -/** - * Created by Yang on 2017/9/16. - */ + +@Getter @TableName(value = "cxaicorg.t_orgUnits") public class OrgUnits implements Serializable { - // Fields @TableField(value = "ORGUNITID") private String orgUnitId; //机构ID + + @Setter @TableField(value = "ORGUNITNAME") private String orgUnitName; //机构名称 + + @Setter @TableField(value = "ORGNUMBER") private String orgNumber; //机构编码 + @TableField(value = "PARENTID") private String parentId; //父级ID + @TableField(value = "UNITTYPE") private String unitType; //组织类型 + + @Setter @TableField(value = "ORGLEVEL") private Integer orgLevel; //组织层次 + + @Setter @TableField(value = "DELETED") private String deleted; //是否删除 0:没有删除 1:删除 + @TableField(exist = false) private String locDistrict; //行政区划，业务用 @@ -56,69 +67,4 @@ public class OrgUnits implements Serializable { this.unitType = unitType; } - // Property accessors - - public String getOrgUnitId() { - return this.orgUnitId; - } - - public void setOrgUnitId(String orgUnitId) { - this.orgUnitId = orgUnitId; - } - - public String getOrgUnitName() { - return this.orgUnitName; - } - - public void setOrgUnitName(String orgUnitName) { - this.orgUnitName = orgUnitName; - } - - public String getOrgNumber() { - return this.orgNumber; - } - - public void setOrgNumber(String orgNumber) { - this.orgNumber = orgNumber; - } - - public String getParentId() { - return this.parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getUnitType() { - return this.unitType; - } - - public void setUnitType(String unitType) { - this.unitType = unitType; - } - - public Integer getOrgLevel() { - return this.orgLevel; - } - - public void setOrgLevel(Integer orgLevel) { - this.orgLevel = orgLevel; - } - - public String getDeleted() { - return deleted; - } - - public void setDeleted(String deleted) { - this.deleted = deleted; - } - - public String getLocDistrict() { - return locDistrict; - } - - public void setLocDistrict(String locDistrict) { - this.locDistrict = locDistrict; - } } diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml index bcc22d0..751b3a7 100644 --- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml @@ -1600,7 +1600,16 @@