Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-12-08 284a4b9bda8f7c09f550c15e71ced282e5531a08

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

# Conflicts:
#	flower_city/src/main/java/com/dg/core/controller/CommonController.java
#	flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
#	flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
#	flower_city/src/main/java/com/dg/core/service/ISysUserService.java
#	flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
#	flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
#	flower_city/src/main/java/com/dg/core/util/SmsUtil.java
#	flower_city/src/main/resources/application.properties
#	flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
#	flower_city/src/main/resources/mapper/SysUserMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
#	springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml
#	springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
#	springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/MyAESUtil.java
#	springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
#	springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MyAESUtil.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaConfiguration.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
#	springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java
#	springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java
#	springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

 flower_city/src/main/resources/application.properties

@@ -1,9 +1,11 @@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.username=root
#spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
spring.datasource.username=remote
spring.datasource.password=Panzhihua!@#admin123#@!
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8

#spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://118.121.197.120:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8

server.port=8187
#server.port=8088
@@ -11,10 +13,15 @@
swagger.enabled=true
swagger.pathMapping=/
#Redis
spring.redis.host=127.0.0.1
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.database=2
#spring.redis.password=nahanRedisPwsIsVerySimple&&

spring.redis.host=192.168.1.52
spring.redis.port=6379
spring.redis.database=2
spring.redis.password=nahanRedisPwsIsVerySimple&&
spring.redis.password=ODEGi3MXRBNQ8pH2



@@ -33,12 +40,17 @@



ftp.username=root
ftp.password=6-gj!bx@TNb!Dwpjd]1h1Kvqmc
ftp.host=182.151.31.48
ftp.port=22
ftp.url=https://test.panzhihua.nhys.cdnhxx.com/
#ftp.username=root
#ftp.password=6-gj!bx@TNb!Dwpjd]1h1Kvqmc
#ftp.host=182.151.31.48
#ftp.port=22
#ftp.url=https://test.panzhihua.nhys.cdnhxx.com/




ftp.username= root
ftp.password= @!nY0[-zxO
ftp.host= 182.151.24.68
ftp.port= 22
ftp.url= https://www.psciio.com

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java

@@ -14,7 +14,7 @@

    @ApiModelProperty("分类名称")
    @NotBlank(message = "分类名称不能为空")
    @Length(min = 1, max = 5, message = "分类名称不可超过5个字")
    @Length(min = 1, max = 6, message = "分类名称不可超过6个字")
    private String name;

    @ApiModelProperty("分类字体颜色")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -57,7 +57,7 @@
    /**
     * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    @ApiModelProperty(value = "分类类型 1服务范围分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    @JsonSerialize(using = ToStringSerializer.class)

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java

@@ -1059,7 +1059,7 @@
    @ApiOperation(value = "查询西区社区列表")
    @GetMapping("/westList/noToken")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists(null);
        return communityService.getWestCommunityLists("");
    }

    @ApiOperation(value = "删除预约登记记录")

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java

@@ -12,6 +12,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.panzhihua.common.utlis.MimeTypeUtils;
import com.panzhihua.grid_app.config.MinioUtil;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -26,6 +27,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -117,6 +120,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -97,7 +97,7 @@
    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null and areaCode !=&quot;&quot;'> and area_code = #{areaCode} </if> </script>")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);

    @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")
    @Select("select account,plaintext_password as password from com_act where community_id = #{communityId}")
    ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);

    @Select("select name from com_pb_check_unit where id=#{id}")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -72,7 +72,7 @@
    /**
     * 分类类型 1服务类型分类 2技能分类3公告分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类3公告分类")
    @ApiModelProperty(value = "分类类型 1服务范围分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java

@@ -14,9 +14,6 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;


/**
 * 三社联动项目表(ComActSocialProject)表实体类

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageDO.java

@@ -73,7 +73,7 @@
    private Long communityId;

    /**
     * 留言对象 1 社区团队 2 社区党委
     * 留言对象 1 社区团队 2 社区党委 3人大代表
     */

    private Long type;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java

@@ -36,6 +36,7 @@
     * 获取省下的所有区域 tree结构
     * 
     * @param provinceAdcode
     * @param areaCode
     * @return
     */
    R getCityTreeByProvinceCode(Integer provinceAdcode, String areaCode);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java

@@ -94,7 +94,7 @@
        houseRegister.setCreateAt(nowDate);
        houseRegister.setUpdateAt(nowDate);
        try {
            WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService().getQrcodeService();
            WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService(registerDTO.getAreaCode()).getQrcodeService();
            byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("id=" + houseRegister.getId() + "&type=6",
                    minAppJumpPage, 30, true, null, false);
            String authCode = String.format("data:image/png;base64,%s", Base64.encode(bytes));
@@ -444,7 +444,7 @@
        if (!list.isEmpty()) {
            list.stream().forEach(houseRegister -> {
                try {
                    WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService().getQrcodeService();
                    WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService(areaCode).getQrcodeService();
                    byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("id=" + houseRegister.getId() + "&type=6",
                            minAppJumpPage, 30, true, null, false);
                    String authCode = String.format("data:image/png;base64,%s", Base64.encode(bytes));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActEasyPhotoFeedbackDO">
        <id column="id" property="id" />
        <result column="easy_id" property="easyId" />
        <result column="type" property="type" />
        <result column="feedback_content" property="feedbackContent" />
        <result column="feedback_img" property="feedbackImg" />
        <result column="create_at" property="createAt" />
@@ -31,7 +32,26 @@
            com_act_easy_photo_feedback AS caepf
            LEFT JOIN sys_user AS su ON su.user_id = caepf.create_by
        WHERE
            caepf.easy_id = #{easyId}
            caepf.easy_id = #{easyId} AND caepf.type = 1
        ORDER BY caepf.create_at desc
    </select>
    <select id="getPhotoFeedbackListForDpc"
            resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO">
        SELECT
            caepf.id,
            caepf.easy_id,
            caepf.feedback_content,
            caepf.feedback_img,
            caepf.create_at,
            caepf.create_by,
            dpc.`name` as createByName,
            dpc.photo as createByImage
        FROM
            com_act_easy_photo_feedback AS caepf
            LEFT JOIN sys_user AS su ON su.user_id = caepf.create_by
            LEFT JOIN com_act_dpc dpc ON su.phone = dpc.phone
        WHERE
            caepf.easy_id = #{easyId} AND caepf.type = 2
        ORDER BY caepf.create_at desc
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoHandlerMapper.xml

@@ -12,11 +12,8 @@
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultMap="ComActEasyPhotoHandlerMap">
        select
          id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        where id = #{id}
    <select id="queryById" resultType="com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo">
        select t.*,t1.name as senderName from com_act_easy_photo_handler t left join sys_user t1 on t.sender_id = t1.user_id where t.id = #{id}
    </select>

    <!--查询指定行数据-->
@@ -47,7 +44,7 @@
                and t.status = #{dto.status}
            </if>
        </where>
        order by create_at desc
        order by t.create_time desc
    </select>

    <!--查询所有数据-->
@@ -77,6 +74,10 @@
        </where>
        order by create_at desc
    </select>
    <select id="selectHandleRecord"
            resultType="com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo">
        SELECT * FROM com_act_easy_photo_handler WHERE service_id = #{serviceId} AND service_type = #{serviceType}
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -1120,13 +1120,14 @@

    <select id="baseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BaseInfo">
        select count(id) as population,
               IFNULL((select count(id) from com_mng_population_house where community_id = ${communityId}),0) as house,
               IFNULL((select count(id) from com_mng_real_company where community_id = ${communityId}),0) as company,
               IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}),0) as village,
               IFNULL((select count(user_id) from sys_user where community_id = ${communityId} and type=1),0) as user,
                        IFNULL((select count(id) from com_pb_member where community_id = ${communityId} and audit_result =1 ),0) as partyMember,
                        IFNULL((select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state=2 ),0) as volunteer,
                        IFNULL((select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0),0) as partyOrg
            IFNULL((select count(id) from com_mng_population_house where community_id = ${communityId}),0) as house,
            IFNULL((select count(id) from com_mng_real_company where community_id = ${communityId}),0) as company,
            IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}),0) as village,
            IFNULL((select count(user_id) from sys_user where community_id = ${communityId} and type=1),0) as user,
            IFNULL((select count(id) from com_pb_member where community_id = ${communityId} and audit_result =1 ),0) as partyMember,
            IFNULL((select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state=2 ),0) as volunteer,
            IFNULL((select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0),0) as partyOrg,
            IFNULL((select count(id) from com_act_dpc where community_id = ${communityId} AND is_del = 0),0) as dpcNum
        from com_mng_population_community_tags AS cmpct
        where cmpct.community_id = ${communityId}
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

@@ -124,9 +124,9 @@
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 1 AND t1.`type` = 2) AS completeAbnormalTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 0 AND t1.`type` = 1) AS pendingServiceTotal,
        WHERE t2.community_id = #{communityId} AND t1.`status` = 0 AND t1.`type` = 1 and t1.serial_no not like '70%') AS pendingServiceTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 1 AND t1.`type` = 1) AS completeServiceTotal
        WHERE t2.community_id = #{communityId} AND t1.`status` = 1 AND t1.`type` = 1 and t1.serial_no not like '70%') AS completeServiceTotal
    </select>
    <select id="retrieveAbnormalAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
@@ -134,7 +134,7 @@
            SELECT DATE_FORMAT( t.create_time, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_property_alarm t
            LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
            WHERE t1.community_id = #{communityId} AND t.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            WHERE t1.community_id = #{communityId} AND t1.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
@@ -158,7 +158,7 @@
        SELECT COUNT( 1 ) AS num
        FROM com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        WHERE t1.community_id = #{communityId} AND t.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
        WHERE t1.community_id = #{communityId} AND t1.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="retrieveServiceAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
@@ -166,7 +166,7 @@
            SELECT DATE_FORMAT( t.create_time, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_property_alarm t
            LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
            WHERE t1.community_id = #{communityId} AND t.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            WHERE t1.community_id = #{communityId} AND t1.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
@@ -190,7 +190,7 @@
        SELECT COUNT( 1 ) AS num
        FROM com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        WHERE t1.community_id = #{communityId} AND t.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
        WHERE t1.community_id = #{communityId} AND t1.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="getAbnormalList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        SELECT
@@ -198,12 +198,11 @@
        t.create_time,
        t1.phone,
        t1.username AS NAME,
        t3.address AS position
        t1.position
        FROM
        com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        LEFT JOIN com_mng_population_house t3 ON t1.village_id = t3.id
        WHERE t1.community_id = #{communityId} AND t.`type` = #{type} AND t.`status` = #{status}
        WHERE t1.community_id = #{communityId} AND t.`type` = #{type} AND t.`status` = #{status} and t.serial_no not like '70%'
        ORDER BY t.create_time DESC
    </select>
    <select id="getAlarmPointMapData"
@@ -222,7 +221,7 @@
            SELECT DISTINCT(t1.serial_no)
            FROM com_property_alarm t1
            LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
            WHERE t2.community_id = #{communityId} AND t1.`status` = 0
            WHERE t2.community_id = #{communityId} AND t1.`status` = 0 and t1.serial_no not like '70%'
        )
        UNION ALL
        SELECT
@@ -240,7 +239,7 @@
            FROM com_property_alarm t1
            LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
            WHERE t2.community_id = #{communityId} AND t1.`status` = 0
        )
        ) and serial_no not like '70%'
    </select>

    <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComActAnnouncementVO">

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -109,9 +109,10 @@
    /**
     * 根据id查询党员信息
     * @param id    主键id
     * @param areaCode
     * @return  党员信息
     */
    PartyBuildingMemberVO queryById(@Param("id") Long id);
    PartyBuildingMemberVO queryById(@Param("id") Long id, @Param("areaCode") String areaCode);

    /**
     * 分页查询党员数据统计
@@ -142,19 +143,21 @@
     * @param orgIds    党组织id集合
     * @param startTime 查询开始时间
     * @param endTime   查询结束时间
     * @param areaCode
     * @return  社区党组织左下统计数据
     */
    ComDataStatisticsOrgVo getOrgDataStatisticsLeftDown(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds
            ,@Param("startTime") String startTime,@Param("endTime") String endTime);
    ComDataStatisticsOrgVo getOrgDataStatisticsLeftDown(@Param("communityId") Long communityId, @Param("orgIds") List<Long> orgIds
            , @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaCode") String areaCode);

    /**
     * 分页查询社区党组织下党员
     * @param page   分页参数
     * @param communityId   社区id
     * @param orgIds    党组织id集合
     * @param areaCode
     * @return  党员列表
     */
    IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(Page page,@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds);
    IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(@Param("page") Page page, @Param("communityId") Long communityId, @Param("orgIds") List<Long> orgIds, @Param("areaCode") String areaCode);

    /**
     * 查询社区党组织下某个时间段统计数据

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -18,13 +18,15 @@
    </resultMap>

    <select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,
            t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t1.position,
            t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName
        from com_property_alarm t
        left join com_property_equipment t1 on t.serial_no = t1.serial_no
        left join com_mng_population_house t3 on t1.village_id=t3.id
        left join sys_user t2 on t.solve_id = user_id
        left join com_property_equipment t4 on t.receive_no = t4.serial_no
        <where>
            1=1
            1=1 and t.serial_no not like '70%'
            <if test="commonPage.paramId !=null">
                and t1.community_id = ${commonPage.paramId}
            </if>
@@ -35,7 +37,7 @@
                and t.status =#{commonPage.status}
            </if>
            <if test="commonPage.address !=null and commonPage.address !=''">
                and t3.address like concat(#{commonPage.address},'%')
                and t1.position like concat(#{commonPage.address},'%')
            </if>
            <if test="commonPage.username !=null and commonPage.username !=''">
                and t1.username like concat(#{commonPage.username},'%')