Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 2518d1ba4281e17d91b3ac95db921992db56a996

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/partyOrganization/mapper/PartyOrganizationMapper.java

@@ -26,5 +26,8 @@
public interface PartyOrganizationMapper extends BaseMapper<PartyOrganization> {


    List<PartyOrganizationVO> getPage(IPage<PartyOrganizationVO> page, @Param("vo") PartyOrganizationVO partyOrganizationVO);
    List<PartyOrganizationVO> getPage(IPage<PartyOrganizationVO> page,
                                      @Param("vo") PartyOrganizationVO partyOrganizationVO,
                                      @Param("regionChildCodesList") List<String> regionChildCodesList,
                                      @Param("isAdministrator") Integer isAdministrator);
}

 src/main/java/org/springblade/modules/partyOrganization/mapper/PartyOrganizationMapper.xml

@@ -15,7 +15,6 @@
        left join jczz_household jh ON jh.id = jpom.household_id
        WHERE
        jpo.is_deleted = 0

        <if test="vo.organizationName != null and vo.organizationName != ''">
            AND jpo.organization_name LIKE CONCAT('%',#{vo.organizationName},'%')
        </if>

 src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationServiceImpl.java

@@ -1,6 +1,7 @@
package org.springblade.modules.partyOrganization.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.common.cache.SysCache;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.partyOrganization.entity.PartyOrganization;
@@ -12,18 +13,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class PartyOrganizationServiceImpl extends BaseServiceImpl<PartyOrganizationMapper, PartyOrganization> implements IPartyOrganizationService {

    @Autowired
    private IDeptService deptService;

    @Override
    public IPage<PartyOrganizationVO> getPage(IPage<PartyOrganizationVO> page, PartyOrganizationVO partyOrganizationVO) {

        Dept dept = deptService.getById(AuthUtil.getDeptId());
        if (null!=dept){
            partyOrganizationVO.setAreaId(dept.getRegionCode());
        }
        return page.setRecords(baseMapper.getPage(page,partyOrganizationVO));
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
        return page.setRecords(baseMapper.getPage(page,partyOrganizationVO,regionChildCodesList,isAdministrator));
    }
}

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java

@@ -41,7 +41,9 @@
     */
    List<PlaceExtVO> selectPlaceExtPage(IPage page,
                                        @Param("placeExt") PlaceExtVO placeExt,
                                        @Param("houseCodeList") List<String> houseCodeList);
                                        @Param("houseCodeList") List<String> houseCodeList,
                                        @Param("regionChildCodesList") List<String> regionChildCodesList,
                                        @Param("isAdministrator") Integer isAdministrator);

    /**
     * 场所详情表 自定义详情

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -23,8 +23,18 @@
        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
        WHERE
        jpe.is_deleted = 0
        <if test="placeExt.communityCode != null and placeExt.communityCode != ''">
            and jg.community_code like concat('%',#{placeExt.communityCode},'%')
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jg.community_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jg.community_code in ('')
                </otherwise>
            </choose>
        </if>
        <if test="placeExt.placeName != null and placeExt.placeName != ''">
            and jp.place_name like concat('%',#{placeExt.placeName},'%')

 src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java

@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -81,15 +82,13 @@
                placeExt.setCreateUser(AuthUtil.getUserId());
            }
        }
        Dept dept = deptService.getById(AuthUtil.getDeptId());
        if (null != dept) {
            placeExt.setCommunityCode(dept.getRegionCode());
        }
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
        if (AuthUtil.getUserAccount().equals("18879306957")) {
            placeExt.setCommunityCode("361102003027");
            placeExt.setCreateUser(null);
        }
        return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, list));
        return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, list,regionChildCodesList,isAdministrator));
    }

    /**

 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java

@@ -39,7 +39,9 @@
     * @return
     */
    List<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage page,
                                                                @Param("propertyCapitalApply") PropertyCapitalApplyVO propertyCapitalApply);
                                                                @Param("propertyCapitalApply") PropertyCapitalApplyVO propertyCapitalApply,
                                                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                                @Param("isAdministrator") Integer isAdministrator);


}

 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml

@@ -53,8 +53,18 @@
                #{item}
            </foreach>
        </if>
        <if test="propertyCapitalApply.regionCode != null and propertyCapitalApply.regionCode !='' ">
            and jd.community_code like concat('%',#{propertyCapitalApply.regionCode},'%')
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jd.community_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jd.community_code in ('')
                </otherwise>
            </choose>
        </if>
        order by jpca.create_time desc
    </select>

 src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java

@@ -22,6 +22,7 @@
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -71,10 +72,8 @@

    @Override
    public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
        Dept dept = deptService.getById(AuthUtil.getDeptId());
        if (null != dept) {
            propertyCapitalApply.setRegionCode(dept.getRegionCode());
        }
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
        // 判断角色，物业角色只能查询当前小区的
        String userRole = AuthUtil.getUserRole();
        if (userRole.contains("wygly")) {
@@ -86,7 +85,7 @@
                return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
            }
        }
        return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
        return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply,regionChildCodesList,isAdministrator));
    }

    @Autowired

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -111,8 +111,9 @@
    <resultMap id="selectUserDetailMap" type="org.springblade.modules.system.vo.UserDetailVO" autoMapping="true">
        <id property="id" column="id" />
        <collection property="deptList"  javaType="java.util.List"
                    ofType="org.springblade.modules.system.entity.Dept" autoMapping="true">
                    ofType="org.springblade.modules.system.vo.DeptDetailVO" autoMapping="true">
            <id property="id" column="cid"/>
            <id property="level" column="region_level"/>
        </collection>
    </resultMap>

@@ -120,10 +121,12 @@
    <select id="getUserInfo" resultMap="selectUserDetailMap">
        SELECT
        bu.*,
        bd.id as cid,bd.parent_id,bd.ancestors,bd.dept_category,bd.dept_name,bd.full_name,bd.sort,bd.region_code
        bd.id as cid,bd.parent_id,bd.ancestors,bd.dept_category,bd.dept_name,bd.full_name,bd.sort,bd.region_code,
        br.region_level
        FROM blade_user bu
        left join blade_user_dept bud on bud.user_id = bu.id
        left join blade_dept bd on bud.dept_id = bd.id and bd.is_deleted = 0
        left join blade_region br on br.code = bd.region_code
        where bu.is_deleted = 0
        and bu.id = #{userId}
    </select>

 src/main/java/org/springblade/modules/system/vo/DeptDetailVO.java

New file
@@ -0,0 +1,46 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.system.vo;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.system.entity.Dept;

import java.util.ArrayList;
import java.util.List;

/**
 * 视图实体类
 *
 * @author Chill
 */
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DeptVO对象", description = "DeptVO对象")
public class DeptDetailVO extends Dept {
    private static final long serialVersionUID = 1L;

    /**
     * 层级
     */
    private Integer level;
}

 src/main/java/org/springblade/modules/system/vo/UserDetailVO.java

@@ -42,5 +42,5 @@

    private List<Role> roleList = new ArrayList<>();

    private List<Dept> deptList = new ArrayList<>();
    private List<DeptDetailVO> deptList = new ArrayList<>();
}

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java

@@ -54,7 +54,10 @@
     * @param userId
     * @return
     */
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId, @Param("houseCode") String houseCode, @Param("neiCode") String neiCode);
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId,
                                            @Param("houseCode") String houseCode,
                                            @Param("regionChildCodesList") List<String> regionChildCodesList,
                                            @Param("isAdministrator") Integer isAdministrator);

    Integer getStatistics(Long userId,String neiCode);


 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -274,13 +274,22 @@
        WHERE is_deleted = 0
        <if test="userId != null">
            and create_user = #{userId}

        </if>
        <if test="houseCode != null and houseCode != ''">
            and address_code = #{houseCode}
        </if>
        <if test="neiCode != null and neiCode != ''">
            AND jda.nei_code LIKE concat( #{neiCode}, '%' )
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                    and jda.nei_code in
                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jda.nei_code in ('')
                </otherwise>
            </choose>
        </if>
    </select>


 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -89,12 +89,9 @@
     */
    @Override
    public TaskReportStatistics getStatisticsCount(String houseCode) {
        String neiCode = "";
        Dept dept = deptService.getById(AuthUtil.getDeptId());
        if (null != dept) {
            neiCode = dept.getRegionCode();
        }
        return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, neiCode);
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
        return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList,isAdministrator);
    }

    /**

 src/main/java/org/springblade/modules/ureport/HouseholdBean.java

New file
@@ -0,0 +1,39 @@
package org.springblade.modules.ureport;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseholdLabelVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Map;

/**
 * 住户bean
 */
@Component
public class HouseholdBean {

    @Autowired
    private IUserHouseLabelService householdLabelService;

    /**
     * 统计标签
     * @param dsName
     * @param datasetName
     * @param parameters
     * @return
     */
    public R statisticalLabels(String dsName, String datasetName, Map<String, Object> parameters) {
        HouseholdLabelVO householdLabel = new HouseholdLabelVO();
        Query query= new Query();
        query.setCurrent(1);
        query.setSize(100);
        IPage<HouseholdLabelVO> pages = householdLabelService.statisticalLabels(Condition.getPage(query), householdLabel);
        return R.data(pages.getRecords());
    }
}