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

yanghui

2022-11-10 ec96abc7c3d9ef48b00c321eed85f9d934c699a5

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

 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java

@@ -48,7 +48,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -50,7 +50,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java

@@ -47,7 +47,12 @@
    {
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("2")){
         list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
        else {
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
        }
        int num=iElseAccessoryService.countNum(name,ids);
        return getDataTable(list,num);
    }
@@ -64,7 +69,7 @@
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }
@@ -78,7 +83,7 @@
    @ApiOperation("新增附件")
    @PostMapping(path = "/add")
    @Authorization
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
    {
        if(entity==null)
        {
@@ -99,7 +104,7 @@
        {
            return ResultData.error("部门不能为空");
        }

        entity.setCreateUserId(sysUser.getUserId());
        return toAjax(iElseAccessoryService.insertConfig(entity));
    }


 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -45,7 +45,12 @@
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list;
        if (sysUser.getUserType().equals("2")){
              list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
        else {
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        }
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -390,6 +390,20 @@
    }


    /**
     * 获取登录人员信息
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
    {
      return  ResultData.success(sysUse);
    }






 flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java

@@ -66,4 +66,19 @@
    @ApiModelProperty(name = "url", value = "文件地址")
    private String url;

    /**
     * 创建人id
     */
    @ApiModelProperty(name = "id", value = "创建人id")
    private String createUserId;

    /**
     * 是否能删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty(name = "isDelete", value = "是否能删除修改")
    private Integer isDelete;



}

 flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java

@@ -147,4 +147,12 @@
    @ApiModelProperty("推荐办事指南列表")
    private List<TransactionEvent> transactionEventList;


    /**
     * 是否能够删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty("是否能够删除修改")
    private Integer isDelete;

}

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -60,7 +60,7 @@
    /**
     * 用户类型（1系统后台用户     2导办人员用户）
     */
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户）")
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户  3.部门领导  4.普通用户（小程序用户））")
    private String userType;



 flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java

@@ -19,7 +19,8 @@
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);

    /**
     * 获取附件列表全部
@@ -27,7 +28,8 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);


    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java

@@ -16,7 +16,8 @@
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId")  String  userId);


    /**

 flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java

@@ -16,14 +16,14 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取附件列表全部
     * @param Name
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId);


    /**

 flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java

@@ -12,7 +12,7 @@
     * @return
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取详情

 flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java

@@ -16,13 +16,13 @@

    @Override
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name, ids);
                                                      String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name, ids,userId);
    }

    @Override
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids) {
        return baseMapper.selectConfigList(Name,ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -26,7 +26,7 @@
    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("3")){
        if (sysUser.getUserType().equals("4")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);

 flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java

@@ -26,8 +26,8 @@

    @Override
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
                                                      Integer state,String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name,ids);
                                                      Integer state,String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -92,7 +92,7 @@
                newUser.setUserId(huaChengSysUser.getUserId()+"");
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
                newUser.setUserType("3");
                newUser.setUserType("4");
                newUser.setPhonenumber(huaChengSysUser.getPhone());
                newUser.setSex(huaChengSysUser.getSex());
                newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -304,4 +304,9 @@








}

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -315,14 +315,15 @@
            String applicationMaterial = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")) {
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("办理途径、条件和注意事项")) {
                    i = i + 2;
                    break;
                }
                applicationMaterial = applicationMaterial + "办理区域：" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />"
                        + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
                        + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
                        + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />";
                        + "部门名称：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
                        + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
                        + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />"
                        + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(4)) + "<br />";
                applicationMaterial = applicationMaterial + "<br />";
                i++;
            }
@@ -331,13 +332,15 @@
            String acceptConditions = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（二）网上申报")) {
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（二）网上申报")) {
                    i = i + 1;
                    break;
                }
                acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                         +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                acceptConditions = acceptConditions + "<br />";
                i++;
            }
@@ -346,13 +349,15 @@
            String rates = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（三）手机移动申报")) {
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（三）手机移动申报")) {
                    i = i + 1;
                    break;
                }
                rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                rates = rates + "<br />";
                i++;
            }
@@ -361,13 +366,15 @@
            String transactionArea = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
                    i = i + 1;
                    break;
                }
                transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                transactionArea = transactionArea + "<br />";
                i++;
            }
@@ -376,13 +383,15 @@
            String handlingProcedures = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
                    i = i + 1;
                    break;
                }
                handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                handlingProcedures = handlingProcedures + "<br />";
                i++;
            }

 flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml

@@ -26,7 +26,23 @@
    </sql>

    <select id="selectConfigList"  resultMap="ElseAccessoryEntityResult">
        <include refid="selectElseAccessoryEntityVo"/>
        SELECT
        id,
        department_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
        create_time,
        update_time,
        url,
        name,
        create_user_id,
        <if test="userId!=null and userId!=''">
        (case create_user_id when  #{userId} then 1 else 0 end)isDelete
        </if>
        <if test="userId==null or userId==''">
            1 isDelete
        </if>
        FROM
        automessage_else_accessory
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_else_accessory.name like concat('%', #{Name}, '%')
@@ -57,6 +73,7 @@
        <if test="departmentId != null and departmentId != '' ">department_id,</if>
        <if test="name != null and name != '' ">name,</if>
        <if test="url != null and url != '' ">url,</if>
        <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
        update_time,
        create_time
        )values(
@@ -64,6 +81,7 @@
        <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
        <if test="name != null and name != ''  ">#{name},</if>
        <if test="url != null and url != '' ">#{url},</if>
        <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
        sysdate(),
        sysdate()
        )

 flower_city/src/main/resources/mapper/GuideEvolveMapper.xml

@@ -65,10 +65,10 @@
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2)),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2)),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,

 flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml

@@ -47,7 +47,33 @@
    </sql>

    <select id="selectConfigList"  resultMap="ReplyTemplateResult">
        <include refid="selectReplyTemplateVo"/>
        SELECT
        id,
        name,
        create_time,
        update_time,
        handle_state,
        response,
        accessory_url,
        accessory_name,
        video_url,
        video_name,
        picture_url,
        picture_name,
        department_id,
        create_user_id,
        <if test="userId!=null and userId!=''">
            (case create_user_id when  #{userId} then 1 else 0 end)isDelete,
        </if>
        <if test="userId==null or userId==''">
            1 isDelete,
        </if>
        accessory_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
        (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
        guidance
        FROM
        automessage_reply_template
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_reply_template.name like concat('%', #{Name}, '%')

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -153,10 +153,12 @@
        <include refid="selectTransactionEventList"/>
        <where>
            <if test="keyword != null and keyword != ''">
                AND (matter_name like concat('%', #{keyword}, '%')) or
                AND (
                    (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                    or (associate_names like concat('%', #{keyword}, '%'))
                    )

            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java

@@ -68,4 +68,10 @@
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

    @ApiOperation("通知公告列表")
    @GetMapping("notice")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return communityService.noticeList(page,size,propertyId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java

New file
@@ -0,0 +1,70 @@
package com.panzhihua.applets_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author zts
 */
@Slf4j
@Api(tags = {"物业公司"})
@RestController
@RequestMapping("/comProperty")
public class ComPropertyApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comPropertySelectAll(commonPage);
    }

    @ApiOperation(value = "物业公司详情", response = ComPropertyVO.class)
    @ApiImplicitParam(name = "id", value = "物业公司id", required = true)
    @GetMapping("detail")
    public R detailProperty(@RequestParam("id") Long id) {
        return this.communityService.detailProperty(id);
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

    @ApiOperation(value = "通知公告列表",response = ComPropertyVO.class)
    @GetMapping("notice")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return communityService.noticeList(page,size,propertyId);
    }

}

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

@@ -134,6 +134,9 @@
    private String unit;
    private String unitId;

    @ApiModelProperty("appId，区分西区或花城")
    private String appId;



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -253,4 +253,7 @@

    @ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家")
    private Integer level;

    @ApiModelProperty("物业公司id")
    private Long propertyId;
}

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
@@ -28,6 +29,7 @@
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;

    /**
@@ -57,4 +59,7 @@

    @ApiModelProperty("分类名称")
    private String columnName;

    @ApiModelProperty("propertyId")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java

@@ -43,4 +43,5 @@
    /**调解上传图片地址列表，逗号进行分割*/
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
    private List<ComEventRequestImageVO> images;
    private String appId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10566,4 +10566,10 @@

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);

    /**
     * 获取物业公司通知公告列表
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyApi.java

@@ -83,4 +83,9 @@
    public R detailProperty(@RequestParam("id") Long id) {
        return comPropertyService.detailProperty(id);
    }

    @GetMapping("/noticeList")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return comPropertyService.noticeList(page,size,propertyId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -66,6 +66,7 @@
        comEvent.setRequestUserId(loginUser.getUserId());
        comEvent.setRequestUserName(loginUser.getName());
        comEvent.setRequestUserTel(loginUser.getPhone());
        comEvent.setAppId(loginUser.getAppId());
        return comEventService.insertComEvent(comEvent);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -51,6 +51,7 @@
    @PostMapping
    public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
        comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
        comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
        return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
    }


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

@@ -30,4 +30,5 @@
     * */
    List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);


}

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

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;
@@ -104,4 +106,6 @@
     * @return
     */
    List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId);

    IPage<ComActAnnouncementVO> noticeList(Page page, @Param("propertyId") Long propertyId);
}

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

@@ -29,7 +29,7 @@
     * @param id 社区或街道或业务中心id
     * @return 处理结果
     * */
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level);
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level,@Param("appId")String appId);

    /**
     * 专家风采列表
@@ -70,7 +70,7 @@

    Integer selectExpertVoList();

    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id);
    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id,@Param("appId")String appId);
}



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

@@ -66,5 +66,9 @@
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 物业公司id
     * */
    private Long propertyId;

}

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

@@ -40,12 +40,12 @@
    /**
     * 是否删除0否1是
     */
    private Boolean delFlag;
    private Integer delFlag;

    /**
     * 状态0可用1禁用
     */
    private Boolean status;
    private Integer status;

    /**
     * 创建时间

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

@@ -214,5 +214,6 @@
    //更换专家
    @TableField(exist = false)
    private Integer changeExpert;
    private String appId;

}

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

@@ -129,8 +129,7 @@
    @TableField(exist = false)
    private BigDecimal rate;
    private Integer added;


    private String appId;
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;


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

@@ -55,4 +55,10 @@
     * @return
     */
    R detailProperty(Long id);

    /**
     * 物业公司通知公告列表
     * @param propertyId 物业公司Id
     * */
    R noticeList(Integer page, Integer size, Long propertyId);
}

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

@@ -46,7 +46,10 @@
            ComActProceedings comActProceedings=new ComActProceedings();
            comActProceedings.setId(Snowflake.getId());
            comActProceedings.setCreateTime(new Date());
            int i = comActProceedingsDao.insertSelective(comActProceedings);
            comActProceedings.setDelFlag(0);
            comActProceedings.setStatus(0);
            BeanUtils.copyProperties(comActProceedingsDTO, comActProceedings);
            int i = comActProceedingsDao.insert(comActProceedings);
            if (i>0){
                return R.ok();
            }

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

@@ -97,6 +97,7 @@
        Boolean isExpertCheck=false;
        Long expertId=null;
        Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
        comEvent.setAppId(loginUserInfoVO.getAppId());
        if (nonNull(comEvent.getUserType())){
            if (comEvent.getUserType().equals(1)){
                //个人账号权限
@@ -1004,6 +1005,7 @@
            }
        }
        log.info("当前userType===="+comEvent.getUserType());
        comEvent.setAppId(loginUserInfoVO.getAppId());
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");

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

@@ -60,6 +60,9 @@
            if (isNotBlank(comPropertyVO.getAccount())) {
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setType(3);
                if (comPropertyVO.getCommunityId().equals(10172)){
                    administratorsUserVO.setType(20);
                }
                administratorsUserVO.setAccount(comPropertyVO.getAccount());
                administratorsUserVO.setPassword(comPropertyVO.getPassword());
                administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
@@ -142,4 +145,9 @@
        comPropertyVO.setPassword(null);
        return R.ok(comPropertyVO);
    }

    @Override
    public R noticeList(Integer page, Integer size, Long propertyId) {
        return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId));
    }
}

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

@@ -196,7 +196,7 @@
            range=1;
        }
        log.info("");
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level,loginUserInfo.getAppId());
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
            //获取调解次数和成功率
            record.setCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId())));
@@ -431,16 +431,16 @@
        if (nonNull(level)){
            if (level.equals(1)){
                //三说会堂权限，查看所有
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId()));
            }else if (level.equals(2)){
                //行业分中心
                ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId()));
            }else if (level.equals(3)){
                //街道
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId()));
            }else if(level.equals(4)){
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId()));
            }
        }
        return null;

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

@@ -31,12 +31,10 @@
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings (id,`name`, unit_name, unit_id,
      introduce, del_flag, `status`, 
      create_time, create_by, update_time, 
      update_by)
    values (#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, 
      create_time)
    values (#{id},#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT},
      #{introduce,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{status,jdbcType=BIT}, 
      #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
      #{updateBy,jdbcType=TIMESTAMP})
      #{createTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings

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

@@ -57,6 +57,7 @@
        FROM com_sanshuo_event_info
        <where>
            event_process_status !=9
            AND app_id=#{comEvent.appId}
            <if test="comEvent.keyword != null and comEvent.keyword!=''" >
                AND    ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword})
            </if>
@@ -104,6 +105,7 @@
        FROM com_sanshuo_event_info
        <where>
            event_process_status !=9
            AND app_id=#{comEvent.appId}
            <if test="eventIds != null">
                AND id in 
                <foreach collection="eventIds" item="id" separator="," open="(" close=")">
@@ -162,6 +164,7 @@
        from com_sanshuo_event_info
        <where>
            event_process_status not in (9)
            AND app_id=#{comEvent.appId}
        <if test="comEvent.userType == 1">
            AND request_user_id=#{comEvent.requestUserId}
        </if>
@@ -193,7 +196,7 @@
        from com_sanshuo_event_info
        <where>
            event_process_status not in (9)

            AND app_id=#{comEvent.appId}
            <if test="comEvent.userType == 1">
                AND request_user_id=#{comEvent.requestUserId}
            </if>
@@ -224,6 +227,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status  in (2,3,5,6)
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -249,6 +253,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 5
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -273,6 +278,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 6
        AND user_event_status not in(3)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -300,6 +306,7 @@
        where t.event_process_status in (6,7)
        AND t.user_event_status not in(3,4)
        AND t1.event_status=7
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND t.current_process_type=1
            <if test="dto.id != null">
@@ -324,6 +331,7 @@
        (select count(id) FROM com_sanshuo_event_info
        where event_result=2
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -348,6 +356,7 @@
        (select count(id) FROM com_sanshuo_event_info
        where event_result=1
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -372,6 +381,7 @@
        (select count(id) from com_sanshuo_event_info WHERE
        create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (8)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -397,6 +407,7 @@
        create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (8)
        AND event_process_status = 6
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -424,6 +435,7 @@
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (9)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -450,6 +462,7 @@
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status=6
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -475,17 +488,19 @@
    <select id="eventRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(id) as count,current_process_type from com_sanshuo_event_info
        where event_process_status not in(7,8,9)
        AND app_id='wx0cef797390444b75'
        group by current_process_type
        having current_process_type &lt;>5
    </select>
    <select id="expertRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(id) as count,level as type  from com_sanshuo_expert
        select count(id) as count,level as type  from com_sanshuo_expert where app_id='wx0cef797390444b75'
        group by level
    </select>
    <select id="mediateTypeRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(t.id) as count,t1.name from com_sanshuo_event_info t
        left join com_mediate_type t1 on t.event_category=t1.id
        where t.event_process_status not in(7,8,9)
        AND t.app_id='wx0cef797390444b75'
        group by t.event_category
    </select>


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

@@ -243,4 +243,8 @@
        )
    </select>

    <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComActAnnouncementVO">
        select * from com_act_announcement where property_id=#{propertyId}
    </select>

</mapper>

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

@@ -48,6 +48,7 @@
        introduction,street_id,industry_center_id,
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
        AND app_id=#{appId}
            <if test="keyWord != null and keyWord != ''">
                AND unit like concat('%',#{keyWord},'%')
                OR name like concat('%',#{keyWord},'%')
@@ -157,6 +158,7 @@
        introduction,street_id,industry_center_id,
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
        AND app_id=#{appId}
        <if test="level != null">
            <if test="level == 2">
                AND level = 2

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -435,4 +435,9 @@
     * 是否为党员
     * */
    int isDpcMember(@Param("phone") String phone,@Param("name")String name);

    /**
     * 是否为物业公司后台账号
     * */
    Long isPropertyAccount(String phone);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -792,6 +792,13 @@
        //是否是防疫工作人员
        loginUserInfoVO.setIsAcidMember(0);
        ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone());
        //是否为普达物业公司后台账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        if (nonNull(acidMember)) {
            if (acidMember.getRelationName().equals("panzhihua") || acidMember.getRelationName().equals("西区") || acidMember.getRelationName().equals("东区") || acidMember.getRelationName().equals("仁和区") || acidMember.getRelationName().equals("米易县") || acidMember.getRelationName().equals("盐边县")) {
                loginUserInfoVO.setIsAcidMember(1);
@@ -1354,6 +1361,9 @@
                this.putMenuRole(menuRoleVO);
            }
        }
        if (administratorsUserVO.getType().equals(20)){
            roleId=1559112102373756548L;
        }
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -838,4 +838,7 @@
    <select id="isDpcMember" resultType="Integer">
         select count(id) from com_act_dpc where name =#{name} and phone=#{phone}
    </select>
    <select id="isPropertyAccount" resultType="java.lang.Long">
        select id from com_property where phone=#{phone}
    </select>
</mapper>