应用更新上级名称

src/main/java/com/pms/ocp/mapper/TenantMapper.java

@@ -43,4 +43,19 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
      */
     OcpTenantGroup selectGroupCode(String tenantGroupCode);
 
+
+    /**
+     * 根据pcode查询上级名称
+     * @param tenantGroupPcode
+     * @return
+     */
+    OcpTenantGroup selectGroupName(String tenantGroupPcode);
+
+    /**
+     * 模糊查询
+     * @param ocpTenantGroup
+     * @return
+     */
+   List<OcpTenantGroup> selectLikeList(OcpTenantGroup ocpTenantGroup);
+
 }

src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Date;
 
 /**
  * 应用分类表
+ *
  * @TableName ocp_tenant_group
  */
 @Data
@@ -124,6 +126,18 @@ public class OcpTenantGroup implements Serializable {
     @TableField(exist = false)
     private String num;
 
+    @ApiModelProperty("模糊查询字段")
+    @TableField(exist = false)
+    private String keyword;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     public String getNum() {
         return num;
     }
@@ -379,19 +393,19 @@ public class OcpTenantGroup implements Serializable {
         }
         OcpTenantGroup other = (OcpTenantGroup) that;
         return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
-            && (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode()))
-            && (this.getTenantGroupName() == null ? other.getTenantGroupName() == null : this.getTenantGroupName().equals(other.getTenantGroupName()))
-            && (this.getTenantGroupCompanyCode() == null ? other.getTenantGroupCompanyCode() == null : this.getTenantGroupCompanyCode().equals(other.getTenantGroupCompanyCode()))
-            && (this.getTenantGroupPcode() == null ? other.getTenantGroupPcode() == null : this.getTenantGroupPcode().equals(other.getTenantGroupPcode()))
-            && (this.getTenantType() == null ? other.getTenantType() == null : this.getTenantType().equals(other.getTenantType()))
-            && (this.getTenantGroupVersion() == null ? other.getTenantGroupVersion() == null : this.getTenantGroupVersion().equals(other.getTenantGroupVersion()))
-            && (this.getTenantGroupOrderNo() == null ? other.getTenantGroupOrderNo() == null : this.getTenantGroupOrderNo().equals(other.getTenantGroupOrderNo()))
-            && (this.getTenantGroupUserId() == null ? other.getTenantGroupUserId() == null : this.getTenantGroupUserId().equals(other.getTenantGroupUserId()))
-            && (this.getTenantGroupUserName() == null ? other.getTenantGroupUserName() == null : this.getTenantGroupUserName().equals(other.getTenantGroupUserName()))
-            && (this.getTenantGroupCtime() == null ? other.getTenantGroupCtime() == null : this.getTenantGroupCtime().equals(other.getTenantGroupCtime()))
-            && (this.getTenantGroupMtime() == null ? other.getTenantGroupMtime() == null : this.getTenantGroupMtime().equals(other.getTenantGroupMtime()))
-            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
-            && (this.getTenantGroupLevel() == null ? other.getTenantGroupLevel() == null : this.getTenantGroupLevel().equals(other.getTenantGroupLevel()));
+                && (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode()))
+                && (this.getTenantGroupName() == null ? other.getTenantGroupName() == null : this.getTenantGroupName().equals(other.getTenantGroupName()))
+                && (this.getTenantGroupCompanyCode() == null ? other.getTenantGroupCompanyCode() == null : this.getTenantGroupCompanyCode().equals(other.getTenantGroupCompanyCode()))
+                && (this.getTenantGroupPcode() == null ? other.getTenantGroupPcode() == null : this.getTenantGroupPcode().equals(other.getTenantGroupPcode()))
+                && (this.getTenantType() == null ? other.getTenantType() == null : this.getTenantType().equals(other.getTenantType()))
+                && (this.getTenantGroupVersion() == null ? other.getTenantGroupVersion() == null : this.getTenantGroupVersion().equals(other.getTenantGroupVersion()))
+                && (this.getTenantGroupOrderNo() == null ? other.getTenantGroupOrderNo() == null : this.getTenantGroupOrderNo().equals(other.getTenantGroupOrderNo()))
+                && (this.getTenantGroupUserId() == null ? other.getTenantGroupUserId() == null : this.getTenantGroupUserId().equals(other.getTenantGroupUserId()))
+                && (this.getTenantGroupUserName() == null ? other.getTenantGroupUserName() == null : this.getTenantGroupUserName().equals(other.getTenantGroupUserName()))
+                && (this.getTenantGroupCtime() == null ? other.getTenantGroupCtime() == null : this.getTenantGroupCtime().equals(other.getTenantGroupCtime()))
+                && (this.getTenantGroupMtime() == null ? other.getTenantGroupMtime() == null : this.getTenantGroupMtime().equals(other.getTenantGroupMtime()))
+                && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+                && (this.getTenantGroupLevel() == null ? other.getTenantGroupLevel() == null : this.getTenantGroupLevel().equals(other.getTenantGroupLevel()));
     }
 
     @Override

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

@@ -39,15 +39,15 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) {
+    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode, String level) {
         List<OcpTenantGroup> ocpTenantGroupList = null;
-        if(StringUtils.isBlank(level) ) {
+        if (StringUtils.isBlank(level)) {
             //顶级目录
             ocpTenantGroupList = tenantMapper.oneTenantGroup();
-        } else if(StringUtils.isNotBlank(level)  && "1".equals(level)) {
+        } else if (StringUtils.isNotBlank(level) && "1".equals(level)) {
             //二级目录
             ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode);
-        } else if (StringUtils.isNotBlank(level)  && "2".equals(level) ||"3".equals(level)) {
+        } else if (StringUtils.isNotBlank(level) && "2".equals(level) || "3".equals(level)) {
             //三级目录
             ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode);
 
@@ -80,11 +80,11 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         group.setTenantGroupVersion("1.0");
         group.setTenantGroupCode(randomString);
 
-        if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())){
+        if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())) {
             group.setTenantGroupLevel("sys_center");
-        } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())){
+        } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())) {
             group.setTenantGroupLevel("api_group");
-        }else {
+        } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) {
             group.setTenantGroupLevel("Middleground");
         }
         group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
@@ -95,7 +95,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
         for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
             String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName();
-            if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)){
+            if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) {
                 falg = false;
                 group.setNum("1");
             }
@@ -149,13 +149,13 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         List<OcpTenantGroup> group = new ArrayList<>();
         List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
         for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
-            if (tenantGroup.getTenantGroupPcode().equals(ocpTenantGroup1.getTenantGroupCode())){
+            if (tenantGroup.getTenantGroupPcode().equals(ocpTenantGroup1.getTenantGroupCode())) {
                 group.add(tenantGroup);
             }
         }
-        if (group.size() >= 1){
+        if (group.size() >= 1) {
             flag = false;
-        }else {
+        } else {
             tenantMapper.deleteById(objId);
         }
         return flag;
@@ -169,28 +169,43 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) {
+    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword, String lev) {
         LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
         OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode);
 
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
-         if("".equals(lev) || "1".equals(lev)) {
-             LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
-             tenantMapper.selectPage(page, eq);
-         }else if ("2".equals(lev) || "3".equals(lev)) {
-                LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
-
+            if ("".equals(lev) || "1".equals(lev)) {
+                LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
                 tenantMapper.selectPage(page, eq);
+            } else if ("2".equals(lev) || "3".equals(lev)) {
+
+                List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroupsList(tenantGroupCode, tenantGroupCompanyCode);
+                for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
+                    String tenantGroupCode1 = tenantGroup.getTenantGroupCode();
+                    OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1);
+                    tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName());
+                }
+//                LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
+
+                page.setRecords(ocpTenantGroupList);
+                page.setTotal(ocpTenantGroupList.size());
             }
         } else if (!(StringUtils.isBlank(keyword))) {
             LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))
                     .or().like(OcpTenantGroup::getTenantGroupName, keyword)
                     .or().like(OcpTenantGroup::getTenantGroupPcode, keyword)
                     .or().like(OcpTenantGroup::getTenantGroupUserName, keyword);
+
             tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper);
+//            OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup();
+//            ocpTenantGroup1.setKeyword(keyword);
+//            List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectLikeList(ocpTenantGroup1);
+//            page.setRecords(ocpTenantGroupList);
+//            page.setTotal(ocpTenantGroupList.size());
         }
 
+
         return page;
 
     }

src/main/resources/mapper/OcpTenantGroup.xml

@@ -4,7 +4,7 @@
 
 <!--    顶级目录-->
     <select id="oneTenantGroup"  resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-           SELECT * FROM (select *,ROW_NUMBER() over(partition by  tenant_group_company_code) as rn from ocp_tenant_group) as u where u.rn= 1;
+           SELECT tenant_group_company_code FROM (select tenant_group_company_code,ROW_NUMBER() over(partition by  tenant_group_company_code) as rn from ocp_tenant_group) as u where u.rn= 1;
     </select>
 <!--   二级目录树-->
     <select id="twoTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
@@ -38,6 +38,30 @@
         SELECT * FROM ocp_tenant_group WHERE  tenant_group_code = #{tenantGroupCode};
     </select>
 
+<!--根据pcode查询上级分类名称-->
+    <select id="selectGroupName" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+       select tenant_group_name from ocp_tenant_group WHERE tenant_group_code = #{tenantGroupPcode};
+    </select>
+
+
+<!--   模糊查询-->
+    <select id="selectLikeList" parameterType="java.util.Map" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        select * from ocp_tenant_group
+        <where>
+            <if test="tenant_group_name!=null and user_name!='' ">
+                and tenant_group_name like CONCAT('%', #{tenantGroupName}, '%')
+            </if>
+            <if test="tenant_group_company_code!=null and user_name!='' ">
+                and tenant_group_company_code like CONCAT('%', #{tenantGroupCompanyCode}, '%')
+            </if>
+            <if test="tenant_type!=null and user_name!='' ">
+                and tenant_type like CONCAT('%', #{tenantType}, '%')
+            </if> <if test="tenant_group_user_name!=null and user_name!='' ">
+            and tenant_group_user_name like CONCAT('%', #{tenantGroupUserName}, '%')
+        </if>
+        </where>
+
+    </select>