Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

luofl

2025-03-16 b34230301d2f6618e3f2af344b47ec3737d7007c

Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IPartyMemberService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/pom.xml

@@ -76,6 +76,16 @@
        <dependency>
            <groupId>com.panzhihua</groupId>
            <artifactId>common</artifactId>
            <exclusions>
                <exclusion>
                    <artifactId>easypoi-base</artifactId>
                    <groupId>cn.afterturn</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>easyexcel</artifactId>
                    <groupId>com.alibaba</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
@@ -133,7 +143,50 @@
            <groupId>cn.idev.excel</groupId>
            <artifactId>fastexcel</artifactId>
            <version>1.0.0</version>
            <exclusions>
                <exclusion>
                    <artifactId>poi</artifactId>
                    <groupId>org.apache.poi</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>poi-ooxml</artifactId>
                    <groupId>org.apache.poi</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <!--&lt;!&ndash; Poi-tl Word 模板引擎&ndash;&gt;-->
        <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
            <version>1.10.0</version>
            <exclusions>
                <exclusion>
                    <artifactId>poi</artifactId>
                    <groupId>org.apache.poi</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>poi-ooxml</artifactId>
                    <groupId>org.apache.poi</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
            <version>4.1.2</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>4.1.2</version>
        </dependency>

        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml-schemas</artifactId>
            <version>4.1.2</version>
        </dependency>

    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java

@@ -1,9 +1,25 @@
package com.panzhihua.sangeshenbian.api;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.IComplaintService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.io.IOException;

/**
 * @author mitao
@@ -11,7 +27,49 @@
 */
@Api(tags = {"三个身边后台-诉求管理"})
@RequestMapping("/complaint")
@RestController
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class MgtComplaintController {
public class MgtComplaintController extends BaseController {
    private final IComplaintService complaintService;

    @ApiOperation("诉求列表")
    @PostMapping("/page")
    public R<Page<ComplaintVO>> pageList(@RequestBody ComplaintQuery query) {
        SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
        return R.ok(complaintService.pageList(query,loginUserInfo));
    }
    @ApiOperation("诉求详情")
    @GetMapping("/detail/{id}")
    public R<ComplaintVO> detail(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
        return R.ok(complaintService.getDetailMgt(id));
    }
    @ApiOperation("诉求列表")
    @PostMapping("/export")
    public void export(@RequestBody ComplaintQuery query) {
        SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
        try {
            complaintService.export(query,loginUserInfo);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
    @ApiOperation("社区问题单")
    @GetMapping("/community-problem/{id}")
    public void communityProblem(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
        try {
            complaintService.communityProblem(id);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
    @ApiOperation("问题处理单")
    @GetMapping("/problem-handle/{id}")
    public void problemHandle(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
        complaintService.problemHandle(id);
    }
    @ApiOperation("协调通知单")
    @GetMapping("/coordination-notice/{id}")
    public void coordinationNotice(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
        complaintService.coordinationNotice(id);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
@@ -28,6 +29,7 @@

import javax.validation.Valid;
import java.io.IOException;
import java.util.List;

/**
 * <p>
@@ -96,10 +98,13 @@
    }
    @ApiOperation("导入")
    @PostMapping("/import")
    public R<?> importExcel(@RequestPart("file") MultipartFile file) {
    public R<List<PartyMemberImportFailedVO> > importExcel(@RequestPart("file") MultipartFile file) {
        SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
        partyMemberService.importExcel(loginUserInfo);
        return R.ok();
        try {
            return R.ok(partyMemberService.importExcel(file,loginUserInfo));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
    @ApiOperation("审核")
    @GetMapping("/audit/{id}")

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java

@@ -333,4 +333,11 @@
        log.info("获取行政区划层级联动数据：{}", list);
        return R.ok(list);
    }
    @GetMapping("/regionTree")
    @ApiOperation(value = "获取区县-街道-社区树",tags = {"三个身边后台-人员管理"})
    public R<List<RegionVO>> regionTree(){
        SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
        List<RegionVO> list = systemUserService.getRegionTree(loginUserInfo);
        return R.ok(list);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java

@@ -1,19 +1,18 @@
package com.panzhihua.sangeshenbian.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.annotation.DistributedLock;
import com.panzhihua.sangeshenbian.model.dto.*;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import com.panzhihua.sangeshenbian.model.entity.ProblemType;
import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.IComplaintCommentService;
import com.panzhihua.sangeshenbian.service.IComplaintService;
import com.panzhihua.sangeshenbian.service.IProblemTypeService;
import io.swagger.annotations.Api;
@@ -32,6 +31,7 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Date;
import java.util.List;

/**
@@ -51,6 +51,7 @@

    private final IComplaintService complaintService;
    private final IProblemTypeService problemTypeService;
    private final IComplaintCommentService complaintCommentService;
    @GetMapping("/problem-type/list")
    @ApiOperation("获取诉求问题类型列表")
    public R<List<ProblemType>> problemTypeList() {
@@ -163,7 +164,29 @@
    public R<List<DispatchVO>> getDispatchList() {
        return R.ok(complaintService.getDispatchList(getLoginUserInfo()));
    }



    
    
    /**
     * 评价诉求
     * @param complaintComment
     * @return
     */
    @PostMapping("/commentComplaint")
    @ApiOperation(value = "评价诉求")
    public R<?> commentComplaint(@RequestBody ComplaintComment complaintComment){
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, complaintComment.getComplaintId())
                .eq(ComplaintComment::getDelFlag, 0));
        if(0 != count){
            return R.fail("不能重复评价");
        }
        Long userId = getLoginUserInfo().getUserId();
        complaintComment.setUserId(userId);
        complaintComment.setCreateTime(new Date());
        complaintComment.setCreateBy(userId);
        complaintComment.setUpdateBy(userId);
        complaintComment.setUpdateTime(new Date());
        complaintComment.setDelFlag(0);
        complaintCommentService.save(complaintComment);
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java

@@ -1,13 +1,15 @@
package com.panzhihua.sangeshenbian.dao;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -33,11 +35,10 @@
     * 工单列表
     * @param page
     * @param query
     * @param targetId
     * @param isSuperior
     * @return
     */
    Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("accountLevel") Integer accountLevel, @Param("targetId") String targetId);
    Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query,
                                           @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId);



@@ -46,7 +47,7 @@
     * @param id
     * @return
     */
    ComplaintVO getDetail(@Param("id") Long id,@Param("targetId") String targetId, @Param("isSuperior") Integer isSuperior);
    ComplaintVO getDetail(@Param("id") Long id);

    /**
     * 获取待办诉求
@@ -56,4 +57,27 @@
     * @return
     */
    Page<ComplaintTodoVO> getTodoList(Page<ComplaintTodoVO> page, @Param("targetId") String targetId, @Param("isSuperior") int isSuperior);
    
    
    /**
     * 获取超时未评价的数据
     * @return
     */
    List<Complaint> getTimeoutAndNotComment();

    /**
     * 诉求分页列表
     * @param page
     * @param query
     * @param loginUserInfo
     * @return
     */
    Page<ComplaintVO> pageList(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);

    /**
     * 诉求列表
     * @param query
     * @param loginUserInfo
     */
    List<ComplaintVO> getList(ComplaintQuery query, SystemUserVo loginUserInfo);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java

@@ -98,10 +98,6 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
    @TableField("report_type")
    private Integer reportType;

    @ApiModelProperty(value = "上级类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
    @TableField("superior_type")
    private Integer superiorType;
@@ -109,7 +105,31 @@
    @ApiModelProperty(value = "上级id")
    @TableField("superior_id")
    private Long superiorId;

    
    @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号")
    @TableField("report_type")
    private Integer reportType;
    
    @ApiModelProperty(value = "上报人所属市")
    @TableField("city_code")
    private Integer cityCode;
    
    @ApiModelProperty(value = "上报人所属区县")
    @TableField("districts_code")
    private Integer districtsCode;
    
    @ApiModelProperty(value = "上报人所属街道id")
    @TableField("street_id")
    private Long streetId;
    
    @ApiModelProperty(value = "上报人所属社区id")
    @TableField("community_id")
    private Long communityId;
    
    @ApiModelProperty(value = "上报党员id")
    @TableField("party_member_id")
    private Long partyMemberId;
    
    @ApiModelProperty(value = "创建人")
    @TableField("create_by")
    private Long createBy;

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java

@@ -49,7 +49,7 @@
    @TableField("auditor_id")
    private Long auditorId;

    @ApiModelProperty(value = "审核类型（0：录入1:延期申请, 2:上报申请，3=下派）")
    @ApiModelProperty(value = "审核类型（1:延期申请, 2:上报申请，3=下派）")
    @TableField("audit_type")
    private Integer auditType;


 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java

@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.xalan.templates.VarNameCollector;

import java.time.LocalDateTime;


 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java

New file
@@ -0,0 +1,45 @@
package com.panzhihua.sangeshenbian.model.excel;

import cn.idev.excel.annotation.ExcelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;

/**
 * @author mitao
 * @date 2025/3/15
 */
@Data
public class ComplaintExcel {
    @ExcelProperty(value = "录入人")
    private String nickname;

    @ExcelProperty(value = "录入人联系方式")
    private String phone;

    @ExcelProperty(value = "群众姓名")
    private String name;

    @ExcelProperty(value = "联系电话")
    private String contactNumber;

    @ExcelProperty(value = "问题发生时间")
    private Date time;

    @ExcelProperty(value = "问题类型")
    private String problemType;

    @ExcelProperty(value = "问题描述内容")
    private String descriptionContent;

    @ExcelProperty(value = "问题发生地点")
    private String location;

    @ExcelProperty(value = "详细地址描述")
    private String detailedAddress;

    @ExcelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
    private Integer status;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java

@@ -2,6 +2,7 @@

import cn.idev.excel.annotation.ExcelProperty;
import com.panzhihua.sangeshenbian.annotation.FastExcel;
import com.panzhihua.sangeshenbian.annotation.TargetEnum;
import com.panzhihua.sangeshenbian.conveter.EConverter;
import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.GenderEnum;
@@ -18,7 +19,7 @@
    private String name;
    
    @ExcelProperty(value = {"性别"}, index = 1,converter = EConverter.class)
    @FastExcel(type = GenderEnum.class)
    @TargetEnum(type = GenderEnum.class)
    private Integer gender;

    @ExcelProperty(value = {"所在社区"}, index = 2)
@@ -31,7 +32,7 @@
    private String partyOrganization;

    @ExcelProperty(value = {"审核状态"}, index = 5,converter = EConverter.class)
    @FastExcel(type = FreezeStatusEnum.class)
    @TargetEnum(type = FreezeStatusEnum.class)
    private Integer freezeStatus;

}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java

@@ -1,10 +1,7 @@
package com.panzhihua.sangeshenbian.model.excel;

import cn.idev.excel.annotation.ExcelProperty;
import com.panzhihua.sangeshenbian.annotation.FastExcel;
import com.panzhihua.sangeshenbian.conveter.EConverter;
import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.GenderEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -14,21 +11,27 @@
@Data
public class PartyMemberTemplate {
    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","姓名"})
    @ApiModelProperty(value = "姓名")
    private String name;

    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","联系电话"})
    @ApiModelProperty(value = "联系电话")
    private String phone;

    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","身份证号"})
    @ApiModelProperty(value = "身份证号")
    private String idNumber;

    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","所在社区"})
    @ApiModelProperty(value = "所在社区")
    private String community;

    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","服务对象"})
    @ApiModelProperty(value = "服务对象")
    private String serviceTarget;

    @ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","所在党组织"})
    @ApiModelProperty(value = "所在党组织")
    private String partyOrganization;

}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java

@@ -1,7 +1,9 @@
package com.panzhihua.sangeshenbian.model.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.entity.ComplaintComment;
import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import io.swagger.annotations.ApiModel;
@@ -57,4 +59,13 @@

    @ApiModelProperty(value = "审核按钮状态（0=显示，1=隐藏）")
    private Integer auditButtonStatus;

    @ApiModelProperty(value = "办结评价")
    private ComplaintComment complaintComment;
    
    @ApiModelProperty(value = "列表操作按钮状态（0=显示，1=隐藏）")
    private Integer listControlsButtonStatus;
    
    @ApiModelProperty(value = "评价按钮状态（0=显示，1=隐藏）")
    private Integer evaluateButtonStatus;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author mitao
 * @date 2025/2/28
@@ -15,4 +17,6 @@
    private String id;
    @ApiModelProperty("名称")
    private String name;
    @ApiModelProperty("子节点")
    private List<RegionVO> children;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/scheduled/ComplaintTasks.java

@@ -9,10 +9,7 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.sangeshenbian.dao.ComplaintAuditRecordMapper;
import com.panzhihua.sangeshenbian.model.dto.ComplaintTimeout;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.entity.MessageNotification;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.entity.WorkOrderItemConfig;
import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.service.*;
import com.panzhihua.sangeshenbian.utils.AliSmsUtil;
import lombok.RequiredArgsConstructor;
@@ -34,6 +31,7 @@
    private final ISystemUserService systemUserService;;
    private final UserService userService;
    private final IMessageNotificationService messageNotificationService;
    private final IComplaintCommentService complaintCommentService;

    /**
     * 诉求超时处理(每天凌晨两点执行)
@@ -80,6 +78,25 @@
        complaintService.updateBatchById(complaintList);
        messageNotificationService.saveBatch(messageNotificationList);
    }
    
    
    /**
     * 自动完成诉求评价
     */
    @Scheduled(cron = "0 1 0 * * ?")
    public void automaticEvaluation() {
        // 诉求超时提醒
        List<Complaint> complaintList = complaintService.getTimeoutAndNotComment();
        for (Complaint complaint : complaintList) {
            ComplaintComment complaintComment = new ComplaintComment();
            complaintComment.setComplaintId(complaint.getId());
            complaintComment.setRate(2);
            complaintComment.setContent("满意");
            complaintComment.setDelFlag(0);
            complaintCommentService.save(complaintComment);
        }
    }
    

    // 诉求超时处理
    private void timeOutHandle(WorkOrderItemConfig config,Integer demandProcessingTime) {

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java

@@ -12,5 +12,10 @@
 * @since 2025-02-23
 */
public interface IBcRegionService extends IService<BcRegion> {

    /**
     * 根据名称查询区县信息
     * @param districtName
     * @return
     */
    BcRegion getDistrictByName(String districtName);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComActService.java

@@ -12,5 +12,11 @@
 * @since 2025-02-23
 */
public interface IComActService extends IService<ComAct> {

    /**
     * 根据社区名称和街道id查询社区
     * @param communityName
     * @param streetId
     * @return
     */
    ComAct getCommunityByNameAndStreet(String communityName, String streetId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComStreetService.java

@@ -12,5 +12,11 @@
 * @since 2025-02-23
 */
public interface IComStreetService extends IService<ComStreet> {

    /**
     * 根据街道名称和区县编码查询街道信息
     * @param streetName
     * @param regionCode
     * @return
     */
    ComStreet getStreetByNameAndDistrict(String streetName, String regionCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
import com.panzhihua.sangeshenbian.model.dto.*;
@@ -15,6 +16,7 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;

import java.io.IOException;
import java.util.List;

/**
@@ -108,4 +110,52 @@
     * @return
     */
    ComplaintAuditRecord delayDetail(Long complaintId);

    /**
     * 管理后台-诉求列表
     *
     * @param query
     * @param loginUserInfo
     * @return
     */
    Page<ComplaintVO> pageList(ComplaintQuery query, SystemUserVo loginUserInfo);

    /**
     * 管理后台-诉求详情
     * @param id
     * @return
     */
    ComplaintVO getDetailMgt(Long id);

    /**
     * 诉求列表导出
     * @param query
     * @param loginUserInfo
     */
    void export(ComplaintQuery query, SystemUserVo loginUserInfo) throws IOException;

    /**
     * 社区问题单
     * @param id
     */
    void communityProblem(Long id) throws IOException;

    /**
     * 问题处理单
     * @param id
     */
    void problemHandle(Long id);

    /**
     * 协调通知
     * @param id
     */
    void coordinationNotice(Long id);
    
    
    /**
     * 获取超时未评价的数据
     * @return
     */
    List<Complaint> getTimeoutAndNotComment();
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IPartyMemberService.java

@@ -6,9 +6,11 @@
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberApplicationRequest;
import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
import com.panzhihua.sangeshenbian.warpper.PendingPartyMemberApplicationVO;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.List;
@@ -59,10 +61,13 @@
    void export(PartyMemberQuery query, SystemUserVo loginUserInfo) throws IOException;

    /**
     *导入
     * 导入
     *
     * @param file
     * @param loginUserInfo
     * @return
     */
    void importExcel(SystemUserVo loginUserInfo);
    List<PartyMemberImportFailedVO> importExcel(MultipartFile file, SystemUserVo loginUserInfo) throws IOException;

    /**
     * 党员申请

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.warpper.SystemUserList;
@@ -57,4 +58,11 @@
     * @return
     */
    List<RegionVO> getCommunity(String streetId);

    /**
     * 获取区县-街道-社区树
     * @param loginUserInfo
     * @return
     */
    List<RegionVO> getRegionTree(SystemUserVo loginUserInfo);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java

@@ -16,5 +16,16 @@
 */
@Service
public class BcRegionServiceImpl extends ServiceImpl<BcRegionMapper, BcRegion> implements IBcRegionService {

    /**
     * 判断区县是否存在
     * @param districtName
     * @return
     */
    @Override
    public BcRegion getDistrictByName(String districtName) {
        return this.lambdaQuery()
                .eq(BcRegion::getRegionName, districtName)
                .eq(BcRegion::getDeleteFlag, 0)
                .eq(BcRegion::getHierarchyOrder, 2).last("LIMIT 1").one();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComActServiceImpl.java

@@ -16,5 +16,14 @@
 */
@Service
public class ComActServiceImpl extends ServiceImpl<ComActMapper, ComAct> implements IComActService {

    /**
     * 根据社区名字和街道id查询社区信息
     * @param communityName
     * @param streetId
     * @return
     */
    @Override
    public ComAct getCommunityByNameAndStreet(String communityName, String streetId) {
        return this.lambdaQuery().eq(ComAct::getName, communityName).eq(ComAct::getStreetId, streetId).last("LIMIT 1").one();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComStreetServiceImpl.java

@@ -16,5 +16,14 @@
 */
@Service
public class ComStreetServiceImpl extends ServiceImpl<ComStreetMapper, ComStreet> implements IComStreetService {

    /**
     * 根据街道名称和区县编码查询街道信息
     * @param streetName
     * @param regionCode
     * @return
     */
    @Override
    public ComStreet getStreetByNameAndDistrict(String streetName, String regionCode) {
        return this.lambdaQuery().eq(ComStreet::getName, streetName).eq(ComStreet::getAreaCode, regionCode).last("LIMIT 1").one();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -1,11 +1,14 @@
package com.panzhihua.sangeshenbian.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.idev.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.deepoove.poi.XWPFTemplate;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
@@ -18,6 +21,8 @@
import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.excel.ComplaintExcel;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
@@ -29,16 +34,25 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.utils.FileUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;

@@ -65,6 +79,9 @@
    private final IComStreetService comStreetService;
    private final IComActService comActService;
    private final IWorkOrderItemConfigService workOrderItemConfigService;
    private final IComplaintCommentService complaintCommentService;
    private final HttpServletResponse response;
    private final IPartyMemberService partyMemberService;

    @Override
    public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
@@ -92,36 +109,45 @@
        complaint.setSerialNumber(serialNumber);
        Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
        Integer accountLevel = 5;
        Long superiorId = null;
        if (systemUserOpt.isPresent()) {
            SystemUser systemUser = systemUserOpt.get();
            accountLevel = systemUser.getAccountLevel();
            switch (accountLevel) {
                case 1:
                    //市级
                    superiorId = 510400L;
                    complaint.setCityCode(510400);
                    break;
                case 2:
                    //区县级
                    superiorId = Long.parseLong(systemUser.getDistrictsCode());
                    complaint.setCityCode(510400);
                    complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
                    break;
                case 3:
                    //街道
                    superiorId = Long.parseLong(systemUser.getStreetId());
                    complaint.setCityCode(510400);
                    complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
                    complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
                    break;
                case 4:
                    //社区
                    superiorId = systemUser.getCommunityId();
                    complaint.setCityCode(510400);
                    complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
                    complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
                    complaint.setCommunityId(systemUser.getCommunityId());
                    break;
                case 5:
                    //社区
                    superiorId = loginUserInfoVO.getUserId();
                    complaint.setCityCode(510400);
                    complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
                    complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
                    complaint.setCommunityId(systemUser.getCommunityId());
                    PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
                    complaint.setPartyMemberId(partyMember.getId());
                    break;
            }
            complaint.setSuperiorType(accountLevel);
            complaint.setSuperiorId(superiorId);
        }else{
            superiorId = loginUserInfoVO.getUserId();
        } else{
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
            complaint.setPartyMemberId(partyMember.getId());
        }
        complaint.setReportType(accountLevel);
        // 设置其他字段
@@ -138,21 +164,6 @@
        complaint.setClosingTime(new Date(System.currentTimeMillis() + config.getDemandProcessingTime() * 24 * 60 * 60 * 1000));
        // 保存诉求记录
        save(complaint);
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        //保存记录
        ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
        complaintAuditRecord.setComplaintId(complaint.getId());
        complaintAuditRecord.setLatestFlag(true);
        complaintAuditRecord.setAuditType(0);
        complaintAuditRecord.setAuditStatus(-1);
        complaintAuditRecord.setCreateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setCreateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord.setReportType(accountLevel);
        complaintAuditRecord.setSuperiorId(superiorId);
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecordService.save(complaintAuditRecord);
    }

    /**
@@ -165,8 +176,209 @@
        Page<ComplaintVO> page = new Page<>(query.getPageNum(), query.getPageSize());
        //判断当前登录用户级别，查询对应工单
        Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
        Long targetId = null;
        Integer accountLevel = 5;
        //上级
        if (systemUserByPhone.isPresent()) {
            SystemUser systemUser = systemUserByPhone.get();
            accountLevel = systemUser.getAccountLevel();
            switch (accountLevel) {
                case 1:
                    //市级
                    targetId = 510400L;
                    break;
                case 2:
                    //区县级
                    targetId = Long.valueOf(systemUser.getDistrictsCode());
                    break;
                case 3:
                    //街道
                    targetId = Long.valueOf(systemUser.getStreetId());
                    break;
                case 4:
                    //社区
                    targetId = systemUser.getCommunityId();
                    break;
                case 5:
                    //党员
                    PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
                    targetId = partyMember.getId();
                    break;
            }
        } else {
            //党员
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
            targetId = partyMember.getId();
        }
        //查询对应诉求
        //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
        page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
        page.getRecords().forEach(s->{
            buttonPermission(s, systemUserByPhone);
        });
        return page;
    }
    
    
    /**
     * 列表按钮权限
     * @param vo
     */
    public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone){
        vo.setListControlsButtonStatus(1);
        vo.setEvaluateButtonStatus(1);
        ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                .ne(ComplaintAuditRecord::getAuditType, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
        //没有审核数据，且正在办理，则按钮权限是添加人员的
        if(null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)){
            if(systemUserByPhone.isPresent()){
                SystemUser systemUser = systemUserByPhone.get();
                Integer accountLevel = systemUser.getAccountLevel();
                Integer isAdmin = systemUser.getIsAdmin();
                //非党员用户，必须是管理员有权限
                if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                    vo.setListControlsButtonStatus(0);
                }
            }else{
                if(vo.getReportType() == 5){
                    vo.setListControlsButtonStatus(0);
                }
            }
        }
        //有审核数据，且正在办理
        if(null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)){
            //区分是上报数据还是下派数据
            if(one.getAuditType() == 2){
                //判断当前审核状态
                if(one.getAuditStatus() == 1){
                    //审核状态为通过，则权限给到上报审核的这一层
                    if(systemUserByPhone.isPresent()){
                        SystemUser systemUser = systemUserByPhone.get();
                        Integer accountLevel = systemUser.getAccountLevel();
                        Integer isAdmin = systemUser.getIsAdmin();
                        //非党员用户，必须是管理员有权限
                        if(accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin){
                            vo.setListControlsButtonStatus(0);
                        }
                    }
                }else{
                    //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 2).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
                    if(null != one1){
                        if(systemUserByPhone.isPresent()){
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if(accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin){
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }else{
                        //没有上一层审核通过的数据，则权限给到添加人
                        if(systemUserByPhone.isPresent()){
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5){
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }
                }
            }
            
            //下派数据
            if(one.getAuditType() == 3){
                //判断当前审核状态
                if(one.getAuditStatus() == 1){
                    //审核状态为通过，则权限给到下报审核的这一层
                    if(systemUserByPhone.isPresent()){
                        SystemUser systemUser = systemUserByPhone.get();
                        Integer accountLevel = systemUser.getAccountLevel();
                        Integer isAdmin = systemUser.getIsAdmin();
                        //非党员用户，必须是管理员有权限
                        if(accountLevel.compareTo(one.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                            vo.setListControlsButtonStatus(0);
                        }
                    }else{
                        if(vo.getReportType() == 5 && one.getReportType() == 5){
                            vo.setListControlsButtonStatus(0);
                        }
                    }
                }else{
                    //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 3).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
                    if(null != one1){
                        if(systemUserByPhone.isPresent()){
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if(accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5 && one1.getReportType() == 5){
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }else{
                        //没有上一层审核通过的数据，则权限给到添加人
                        if(systemUserByPhone.isPresent()){
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5){
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }
                }
            }
        }
        
        //状态为已办结，判断评价按钮
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
        if(vo.getStatus() == 3 && 0 == count){
            if(systemUserByPhone.isPresent()){
                SystemUser systemUser = systemUserByPhone.get();
                Integer accountLevel = systemUser.getAccountLevel();
                Integer isAdmin = systemUser.getIsAdmin();
                if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                    vo.setEvaluateButtonStatus(0);
                }
            }else{
                if(vo.getReportType() == 5){
                    vo.setEvaluateButtonStatus(0);
                }
            }
        }
    }
    
    
    /**
     * 工单详情
     *
     * @param id
     * @return
     */
    @Override
    public ComplaintVO detail(Long id, LoginUserInfoVO loginUserInfoVO) {
        Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
        String targetId = "";
        int isSuperior = 0;
        Integer accountLevel = 5;
        //上级
        if (systemUserByPhone.isPresent()) {
@@ -191,66 +403,16 @@
                    break;
                case 5:
                    //党员
                    targetId = loginUserInfoVO.getUserId().toString();
                    PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
                    targetId = partyMember.getId().toString();
                    break;
            }
            isSuperior = 1;
        } else {
            //党员
            targetId = loginUserInfoVO.getUserId().toString();
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
            targetId = partyMember.getId().toString();
        }
        //查询对应诉求
        //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
        page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
        return page;
    }

    /**
     * 工单详情
     *
     * @param id
     * @return
     */
    @Override
    public ComplaintVO detail(Long id, LoginUserInfoVO loginUserInfoVO) {
        Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
        String targetId = "";
        int isSuperior = 0;
        Integer accountLevel = 5;
        //上级
        if (systemUserByPhone.isPresent()) {
            SystemUser systemUser = systemUserByPhone.get();
            accountLevel = systemUser.getAccountLevel();
            switch (accountLevel) {
                case 1:
                    //市级
                    targetId = "510400";
                    break;
                case 2:
                    //区县级
                    targetId = systemUser.getDistrictsCode();
                    break;
                case 3:
                    //街道
                    targetId = systemUser.getStreetId().toString();
                    break;
                case 4:
                    //社区
                    targetId = systemUser.getCommunityId().toString();
                    break;
                case 5:
                    //社区
                    targetId = loginUserInfoVO.getUserId().toString();
                    break;
            }
            isSuperior = 1;
        } else {
            //党员
            targetId = loginUserInfoVO.getUserId().toString();
        }


        ComplaintVO detail = baseMapper.getDetail(id,targetId, isSuperior);
        ComplaintVO detail = baseMapper.getDetail(id);
        if (detail.getStatus().equals(0)) {
            List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
            detail.setComplaintFlows(list);
@@ -260,14 +422,30 @@
                .orderByAsc(ComplaintProgress::getCreateTime).list();
        detail.setComplaintProgresses(list);
        detail.setAuditButtonStatus(1);
        Long superiorId = detail.getSuperiorId();
        Integer superiorType = detail.getSuperiorType();
        detail.setEvaluateButtonStatus(1);
        if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
            if(superiorType.equals(accountLevel) && superiorId.toString().equals(targetId)){
            ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
                    .eq(ComplaintAuditRecord::getLatestFlag, 1));
            Integer isAdmin = systemUserByPhone.get().getIsAdmin();
            if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
                detail.setAuditButtonStatus(0);
            }
        }

        //已办结，显示评价按钮
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
        if(detail.getStatus() == 3 && 0 == count){
            if(systemUserByPhone.isPresent()){
                SystemUser systemUser = systemUserByPhone.get();
                Integer isAdmin = systemUser.getIsAdmin();
                if(accountLevel.compareTo(detail.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
                    detail.setEvaluateButtonStatus(0);
                }
            }else{
                if(detail.getReportType() == 5){
                    detail.setEvaluateButtonStatus(0);
                }
            }
        }
        return detail;
    }

@@ -319,9 +497,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
        log.info("用户登录数据----------------》" + JSON.toJSONString(loginUserInfoVO));
        String phone = loginUserInfoVO.getPhone();

        SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
                .eq(SystemUser::getPhone, phone)
                .eq(SystemUser::getIsAdmin, 1)
@@ -329,16 +505,13 @@
                .last("LIMIT 1"));

        Long superiorId;
        Long currentId;
        int reportType;
        if (adminUser == null) {
            superiorId = loginUserInfoVO.getCommunityId();
            currentId = 0L;
            if (Objects.isNull(superiorId)) {
                throw new ServiceException("上报失败，请绑定社区");
            }
            reportType = ReportTypeEnum.COMMUNITY.getCode();
            currentId = loginUserInfoVO.getUserId();
        } else {
            int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
            if (accountLevel == 1) {
@@ -349,16 +522,12 @@
            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
                superiorId = Long.parseLong(adminUser.getStreetId());
                currentId = adminUser.getCommunityId();
            } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
                superiorId = Long.parseLong(adminUser.getDistrictsCode());
                currentId = Long.valueOf(adminUser.getStreetId());
            } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
                superiorId = 510400L; // 攀枝花市
                currentId = Long.valueOf(adminUser.getDistrictsCode());
            } else if(accountLevel == ReportTypeEnum.PARTY.getCode()){
                superiorId = adminUser.getCommunityId();
                currentId = loginUserInfoVO.getUserId();
            } else {
                // 处理未预期的账号等级
                throw new ServiceException("未知的账号等级");
@@ -366,9 +535,6 @@
        }

        Complaint complaint = getById(dto.getComplaintId());
        //complaint.setReportType(+);
        complaint.setSuperiorType(reportType);
        complaint.setSuperiorId(superiorId);
        if (complaint.getStatus() != 0) {
            complaint.setStatus(0);
        }
@@ -380,7 +546,6 @@
                .set(ComplaintAuditRecord::getLatestFlag, false));

        // 添加审核记录
        //complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
        complaintAuditRecord.setComplaintId(complaint.getId());
@@ -392,28 +557,11 @@
        complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setUpdateTime(new Date());
        complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
        complaintAuditRecord.setReportType(Objects.isNull(adminUser) ? 5 : adminUser.getAccountLevel());
        complaintAuditRecord.setSuperiorId(currentId);
        complaintAuditRecord.setReportType(reportType);
        complaintAuditRecord.setSuperiorId(superiorId);
        complaintAuditRecord.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecordService.save(complaintAuditRecord);


        ComplaintAuditRecord complaintAuditRecord2 = new ComplaintAuditRecord();
        complaintAuditRecord2.setComplaintId(complaint.getId());
        complaintAuditRecord2.setLatestFlag(true);
        complaintAuditRecord2.setAuditType(2);
        complaintAuditRecord2.setAuditStatus(0);
        complaintAuditRecord2.setCreateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord2.setCreateTime(new Date());
        complaintAuditRecord2.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord2.setUpdateTime(new Date());
        complaintAuditRecord2.setReporter(loginUserInfoVO.getNickName());
        complaintAuditRecord2.setReportType(reportType);
        complaintAuditRecord2.setSuperiorId(superiorId);
        complaintAuditRecord2.setComment(dto.getComment());
        complaintAuditRecord2.setSort(count + 2);
        complaintAuditRecordService.save(complaintAuditRecord2);
    }

    @Override
@@ -437,11 +585,7 @@
        accountLevel++;

        Complaint complaint = getById(dto.getComplaintId());
        complaint.setSuperiorType(accountLevel);
        complaint.setSuperiorId(dto.getDispatchId());
        updateById(complaint);
        Long superiorOrgId = complaint.getSuperiorId();
        Integer superiorType = complaint.getSuperiorType();
        //查询当前单位审核记录表数据
        //查询上报审核记录
        ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery()
@@ -461,7 +605,7 @@
        ComplaintAuditRecord record = new ComplaintAuditRecord();
        record.setComplaintId(complaint.getId());
        record.setLatestFlag(true);
        record.setAuditType(0);
        record.setAuditType(3);
        record.setAuditStatus(1);
        record.setCreateBy(loginUserInfoVO.getUserId());
        record.setCreateTime(new Date(System.currentTimeMillis()));
@@ -507,82 +651,20 @@
                .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel())
                .eq(ComplaintAuditRecord::getSuperiorId, superiorId)
                .last("LIMIT 1").one();
        ComplaintAuditRecord lowLevelRecord = complaintAuditRecordService.lambdaQuery()
                .eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
                .eq(ComplaintAuditRecord::getAuditType, 2)
                .eq(ComplaintAuditRecord::getLatestFlag, true)
                .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel()+1)
                .last("LIMIT 1").one();
        if (Objects.isNull(complaintAuditRecord)) {
            throw new ServiceException("上报申请记录不存在");
        }
        //查询待审核诉求
        //complaintAuditRecordService.audit(complaintAuditRecord,  loginUserInfoVO.getUserId(),
        //        complaintReporAuditDTO.getAuditResult(), complaintReporAuditDTO.getRejectReason());

        // 添加流转记录
        Complaint complaint = getById(complaintAuditRecord.getComplaintId());

        // 标记最新
        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, complaintAuditRecord.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));

        if (complaintReporAuditDTO.getAuditResult().equals(1)) {
            int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
            ComplaintAuditRecord record = new ComplaintAuditRecord();
            record.setComplaintId(complaint.getId());
            record.setLatestFlag(true);
            record.setAuditorId(loginUserInfoVO.getUserId());
            record.setAuditType(2);
            record.setAuditStatus(1);
            record.setCreateBy(loginUserInfoVO.getUserId());
            record.setCreateTime(new Date());
            record.setUpdateBy(loginUserInfoVO.getUserId());
            record.setUpdateTime(new Date());
            record.setReporter(complaintAuditRecord.getReporter());
            record.setReportType(complaintAuditRecord.getReportType());
            record.setSuperiorId(superiorId);
            record.setSort(count + 1);
            complaintAuditRecordService.save(record);
            complaintAuditRecord.setAuditStatus(1);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
            //创建流程
            complaintFlowService.createFlow(lowLevelRecord ,0, loginUserInfoVO.getUserId());
            complaintFlowService.createFlow(complaintAuditRecord ,0, loginUserInfoVO.getUserId());
        } else {

            switch (systemUser.getAccountLevel() + 1) {
                case 1:
                    superiorId = 510400L;//默认市级
                    break;
                case 2:
                    superiorId = Long.parseLong(systemUser.getDistrictsCode());
                    break;
                case 3:
                    superiorId = Long.parseLong(systemUser.getStreetId());
                    break;
                case 4:
                    superiorId = systemUser.getCommunityId();
                    break;
                case 5:
                    superiorId = complaint.getCreateBy();
                    break;
            }
            int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
            ComplaintAuditRecord record2 = new ComplaintAuditRecord();
            record2.setComplaintId(complaint.getId());
            record2.setLatestFlag(true);
            record2.setAuditType(2);
            record2.setAuditorId(loginUserInfoVO.getUserId());
            record2.setAuditStatus(2);
            record2.setCreateBy(loginUserInfoVO.getUserId());
            record2.setCreateTime(new Date());
            record2.setUpdateBy(loginUserInfoVO.getUserId());
            record2.setUpdateTime(new Date());
            record2.setReporter(complaintAuditRecord.getReporter());
            record2.setReportType(systemUser.getAccountLevel() + 1);
            record2.setSuperiorId(superiorId);
            record2.setRejectReason(complaintReporAuditDTO.getRejectReason());
            record2.setSort(count + 1);
            complaintAuditRecordService.save(record2);
            complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
            complaintAuditRecord.setAuditStatus(2);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
        }
    }

@@ -592,55 +674,42 @@
    public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
        SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
        Long superiorId;
        Long currentId;
        int reportType;
        if (systemUser == null) {
            superiorId = loginUserInfoVO.getCommunityId();
            currentId = loginUserInfoVO.getUserId();
            if (Objects.isNull(superiorId)) {
                throw new ServiceException("上报失败，请绑定社区");
                throw new ServiceException("延期申请失败，请绑定社区");
            }
            reportType = ReportTypeEnum.COMMUNITY.getCode();
        } else {
            int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
            if (accountLevel == 1) {
                throw new ServiceException("市级账号,无法上报！");
                throw new ServiceException("市级账号,无法延期申请！");
            }
            reportType = accountLevel - 1;

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
                superiorId = Long.parseLong(systemUser.getStreetId());
                currentId = systemUser.getCommunityId();
            } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
                superiorId = Long.parseLong(systemUser.getDistrictsCode());
                currentId = Long.parseLong(systemUser.getStreetId());
            } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
                superiorId = 510400L; // 攀枝花市
                currentId = Long.parseLong(systemUser.getDistrictsCode());
            } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
                superiorId = systemUser.getCommunityId();
                currentId = loginUserInfoVO.getUserId();
            } else {
                // 处理未预期的账号等级
                throw new ServiceException("未知的账号等级");
            }
        }

        Complaint complaint = getById(dto.getComplaintId());
        complaint.setSuperiorType(reportType);
        complaint.setSuperiorId(superiorId);
        updateById(complaint);
        // 添加审核记录
        //complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO, systemUser);

        // 清除最新记录
        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId()));
        ComplaintAuditRecord record1 = new ComplaintAuditRecord();
        record1.setComplaintId(complaint.getId());
        record1.setComplaintId(dto.getComplaintId());
        record1.setLatestFlag(true);
        record1.setAuditType(1);
        record1.setAuditStatus(0);
@@ -649,44 +718,28 @@
        record1.setUpdateBy(loginUserInfoVO.getUserId());
        record1.setUpdateTime(new Date(System.currentTimeMillis()));
        record1.setReporter(loginUserInfoVO.getNickName());
        record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel());
        record1.setSuperiorId(currentId);
        record1.setReportType(reportType);
        record1.setSuperiorId(superiorId);
        record1.setSort(count + 1);
        record1.setComment(dto.getComment());
        complaintAuditRecordService.save(record1);

        ComplaintAuditRecord record2 = new ComplaintAuditRecord();
        record2.setComplaintId(complaint.getId());
        record2.setLatestFlag(true);
        record2.setAuditType(1);
        record2.setAuditStatus(0);
        record2.setCreateBy(loginUserInfoVO.getUserId());
        record2.setCreateTime(new Date(System.currentTimeMillis()));
        record2.setUpdateBy(loginUserInfoVO.getUserId());
        record2.setUpdateTime(new Date(System.currentTimeMillis()));
        record2.setReporter(loginUserInfoVO.getNickName());
        record2.setReportType(reportType);
        record2.setSuperiorId(superiorId);
        record2.setSort(count + 2);
        record1.setComment(dto.getComment());
        complaintAuditRecordService.save(record2);
    }


    @Override
    public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {

        SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);

        int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
        Long cunrrentId;
        Long superiorId;
        // 使用基本类型比较并补充默认分支
        if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
            cunrrentId = systemUser.getCommunityId();
            superiorId = systemUser.getCommunityId();
        } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
            cunrrentId = Long.parseLong(systemUser.getStreetId());
            superiorId = Long.parseLong(systemUser.getStreetId());
        } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
            cunrrentId = Long.parseLong(systemUser.getDistrictsCode());
            superiorId = Long.parseLong(systemUser.getDistrictsCode());
        }  else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
            superiorId = 510400L;
        } else {
            // 处理未预期的账号等级
            throw new ServiceException("未知的账号等级");
@@ -697,8 +750,8 @@
                .eq(ComplaintAuditRecord::getAuditType, 1)
                .eq(ComplaintAuditRecord::getLatestFlag, 1)
                .eq(ComplaintAuditRecord::getAuditStatus, 0)
                .ne(ComplaintAuditRecord::getSuperiorId, cunrrentId)
                .eq(ComplaintAuditRecord::getReportType, accountLevel+1)
                .ne(ComplaintAuditRecord::getSuperiorId, superiorId)
                .eq(ComplaintAuditRecord::getReportType, accountLevel)
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .last("LIMIT 1"));

@@ -706,37 +759,23 @@
        if (Objects.isNull(complaintAuditRecord)) {
            throw new ServiceException("诉求延期申请不存在");
        }
        //complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
        //        dto.getAuditResult(), dto.getRejectReason());
        //审核通过后，设置诉求延期
        if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
            Complaint complaint = getById(complaintAuditRecord.getComplaintId());
            complaint.setStatus(1);
            updateById(complaint);
            
            complaintAuditRecord.setAuditStatus(1);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
        }


        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, dto.getId()));
        ComplaintAuditRecord record1 = new ComplaintAuditRecord();
        record1.setComplaintId(dto.getComplaintId());
        record1.setLatestFlag(true);
        record1.setAuditType(1);
        record1.setAuditorId(loginUserInfoVO.getUserId());
        record1.setAuditStatus(dto.getAuditResult());
        record1.setCreateBy(loginUserInfoVO.getUserId());
        record1.setCreateTime(new Date(System.currentTimeMillis()));
        record1.setUpdateBy(loginUserInfoVO.getUserId());
        record1.setUpdateTime(new Date(System.currentTimeMillis()));
        record1.setReporter(complaintAuditRecord.getReporter());
        record1.setReportType(complaintAuditRecord.getReportType());
        record1.setSuperiorId(complaintAuditRecord.getSuperiorId());
        record1.setSort(count + 1);
        record1.setRejectReason(dto.getRejectReason());
        complaintAuditRecordService.save(record1);

        //审核不通过
        if(complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)){
            complaintAuditRecord.setRejectReason(dto.getRejectReason());
            complaintAuditRecord.setAuditStatus(2);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
        }
    }

    @Override
@@ -849,5 +888,126 @@
                .eq(ComplaintAuditRecord::getLatestFlag, true)
                .last("LIMIT 1").one();
    }

    /**
     * 管理后台-诉求列表
     *
     * @param query
     * @param loginUserInfo
     * @return
     */
    @Override
    public Page<ComplaintVO> pageList(ComplaintQuery query, SystemUserVo loginUserInfo) {
        return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query,loginUserInfo);
    }

    @Override
    public ComplaintVO getDetailMgt(Long id) {
        Complaint complaint = getById(id);
        ComplaintVO complaintVO = BeanUtil.copyProperties(complaint, ComplaintVO.class);
        //查询办理进度
        List<ComplaintProgress> complaintProgresses = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).orderByAsc(ComplaintProgress::getCreateTime).list();
        complaintVO.setComplaintProgresses(complaintProgresses);
        //查询诉求流转记录
        List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
        complaintVO.setComplaintFlows(complaintFlows);
        //查询评价
        ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
        complaintVO.setComplaintComment(comment);
        return complaintVO;
    }

    /**
     * 诉求列表导出
     * @param query
     * @param loginUserInfo
     */
    @Override
    public void export(ComplaintQuery query, SystemUserVo loginUserInfo) throws IOException {
        List<ComplaintVO> list =  baseMapper.getList(query, loginUserInfo);
        List<ComplaintExcel> complaintExcels = BeanUtil.copyToList(list, ComplaintExcel.class);
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("诉求数据", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), PartyMemberExcel.class)
                .sheet("诉求数据")
                .doWrite(complaintExcels);
    }

    @Override
    public void communityProblem(Long id) throws IOException {
        //Complaint complaint = getById(id);
        //TODO 查询真实数据
        Map<String, Object> map = new HashMap<>();
        map.put("community", "社区社区");
        map.put("problemType", "就业");
        map.put("descriptionContent", "描述内容");
        map.put("reportType", "党员");
        map.put("partyOrganization", "石羊党群");
        map.put("name", "张三");
        map.put("contactNumber", "1888888888");
        map.put("nickname", "李四");
        map.put("phone", "17777777777");
        // 在文本中直接使用换行符
        String content = "第一行内容\n第二行内容\n第三行内容";
        map.put("complaintProgress", content);
        map.put("status", "处理中");
        response.setContentType("application/octet-stream");
        String fileName = URLEncoder.encode("社区问题单", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition","attachment;filename=\""+fileName+".docx"+"\"");
        String fileTemplateName = FileUtil.getPath() + "template/社区问题单.docx";
        XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
    }
    /**
     * 问题处理单
     * @param id
     */
    @Override
    public void problemHandle(Long id) {

    }
    /**
     * 协调通知
     * @param id
     */
    @Override
    public void coordinationNotice(Long id) {

    }

    public static void main(String[] args) {
        try {
            /*文本*/
            Map<String, Object> map = new HashMap<>();
            map.put("community", "社区社区");
            map.put("problemType", "就业");
            map.put("descriptionContent", "描述内容");
            map.put("reportType", "党员");
            map.put("partyOrganization", "石羊党群");
            map.put("name", "张三");
            map.put("contactNumber", "1888888888");
            map.put("nickname", "李四");
            map.put("phone", "17777777777");
            // 在文本中直接使用换行符
            String content = "第一行内容\n第二行内容\n第三行内容";
            map.put("complaintProgress", content);
            map.put("status", "处理中");
            XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\社区问题单.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
    
    
    /**
     * 获取超时未评价的数据
     * @return
     */
    @Override
    public List<Complaint> getTimeoutAndNotComment() {
        return this.baseMapper.getTimeoutAndNotComment();
    }

}


 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java

@@ -2,20 +2,33 @@

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.idev.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.dao.PartyMemberMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.model.entity.BcRegion;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
import com.panzhihua.sangeshenbian.service.IComActService;
import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberApplicationRequest;
@@ -26,10 +39,13 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -47,6 +63,9 @@
public class PartyMemberServiceImpl extends ServiceImpl<PartyMemberMapper, PartyMember> implements IPartyMemberService {
    private final HttpServletResponse response;
    private final ISystemUserService systemUserService;
    private final IBcRegionService bcRegionService;
    private final IComStreetService comStreetService;
    private final IComActService comActService;
    /**
     * 党员分页查询列表
     *
@@ -71,6 +90,8 @@
        if (Objects.isNull(dto.getId())) {
            //添加
            partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
            partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
            partyMember.setSource(1);
            save(partyMember);
        } else {
            partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
@@ -96,7 +117,7 @@
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("党员导入模板", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), PartyMemberTemplate.class)
        EasyExcel.write(response.getOutputStream(), PartyMemberTemplate.class)
                .sheet("党员导入模板")
                .doWrite(Collections.emptyList());
    }
@@ -114,18 +135,158 @@
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("党员数据", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), PartyMemberExcel.class)
        EasyExcel.write(response.getOutputStream(), PartyMemberExcel.class)
                .sheet("党员数据")
                .doWrite(partyMemberExcels);
    }

    /**
     *
     * @param file
     * @param loginUserInfo
     */
    @Override
    public void importExcel(SystemUserVo loginUserInfo) {
    @Transactional(rollbackFor = Exception.class)
    public List<PartyMemberImportFailedVO> importExcel(MultipartFile file, SystemUserVo loginUserInfo) throws IOException {
        // 使用 FastExcel 同步读取 Excel 数据为对象列表
        List<PartyMemberTemplate> list = EasyExcel.read(file.getInputStream()).head(PartyMemberTemplate.class).headRowNumber(2).sheet().doReadSync();
        if (CollUtil.isEmpty(list)) {
            throw new ServiceException("导入数据为空");
        }

        // 存储验证失败的记录
        List<PartyMemberImportFailedVO> failedList = new ArrayList<>();
        // 存储验证成功的记录
        List<PartyMember> validPartyMembers = new ArrayList<>();

        // 手机号正则表达式
        String phoneRegex = "^1[3-9]\\d{9}$";
        // 身份证号正则表达式
        String idCardRegex = "(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)";

        // 批量验证数据
        for (PartyMemberTemplate template : list) {
            PartyMemberImportFailedVO failedVO = new PartyMemberImportFailedVO();
            boolean isValid = true;
            StringBuilder errorMsg = new StringBuilder();

            // 复制数据到失败记录对象
            BeanUtil.copyProperties(template, failedVO);

            // 1. 验证手机号
            if (StrUtil.isBlank(template.getPhone()) || !template.getPhone().matches(phoneRegex)) {
                isValid = false;
                errorMsg.append("手机号格式不正确; ");
            }

            // 2. 验证身份证号
            if (StrUtil.isBlank(template.getIdNumber()) || !template.getIdNumber().matches(idCardRegex)) {
                isValid = false;
                errorMsg.append("身份证号格式不正确; ");
            }

            // 3. 验证账号是否已存在
            if (StrUtil.isNotBlank(template.getPhone())) {
                LambdaQueryWrapper<PartyMember> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(PartyMember::getPhone, template.getPhone());
                long count = count(queryWrapper);
                if (count > 0) {
                    isValid = false;
                    errorMsg.append("账号已存在");
                }
            }

            // 4. 验证所在社区
            String districtName = null;
            String streetName = null;
            String communityName = null;
            String districtCode = "";
            String streetId = "";
            Long communityId = null;

            if (StrUtil.isNotBlank(template.getCommunity())) {
                String[] addressParts = template.getCommunity().split("-");
                if (addressParts.length != 3) {
                    isValid = false;
                    errorMsg.append("社区格式不正确，应为'区县-街道-社区'; ");
                } else {
                    districtName = addressParts[0];
                    streetName = addressParts[1];
                    communityName = addressParts[2];

                    // 验证区县、街道、社区信息

                    // 验证区县是否存在
                    BcRegion district = bcRegionService.getDistrictByName(districtName);

                    if (Objects.isNull(district)) {
                        isValid = false;
                        errorMsg.append("区县不存在; ");
                    } else {
                        // 验证街道是否存在且属于该区县
                        ComStreet comStreet =  comStreetService.getStreetByNameAndDistrict(streetName, district.getRegionCode());
                        districtCode = district.getRegionCode();
                        if (Objects.isNull(comStreet)) {
                            isValid = false;
                            errorMsg.append("街道不存在或不属于所选区县; ");
                        } else {
                            // 验证社区是否存在且属于该街道
                            // 实际代码应该是调用相应的Service查询社区信息
                            ComAct comAct = comActService.getCommunityByNameAndStreet(communityName, comStreet.getStreetId());
                            streetId = comStreet.getStreetId();
                            communityId = comAct.getCommunityId();
                            if (Objects.isNull(comAct)) {
                                isValid = false;
                                errorMsg.append("社区不存在或不属于所选街道; ");
                            }
                        }
                    }
                }
            } else {
                isValid = false;
                errorMsg.append("社区信息不能为空; ");
            }

            // 如果验证失败，添加到失败列表，否则添加到成功列表
            if (!isValid) {
                failedVO.setFailReason(errorMsg.toString());
                failedList.add(failedVO);
            } else {
                PartyMember partyMember = new PartyMember();
                BeanUtil.copyProperties(template, partyMember);

                // 设置创建人和更新人
                partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
                partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
                //导入党员默认审核通过
                partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
                partyMember.setSource(1);//管理后台录入
                //默认头像 TODO 默认头像
                partyMember.setAvatar("");
                // 根据身份证号设置性别
                if (StrUtil.isNotBlank(template.getIdNumber())) {
                    partyMember.setGender(getGender(template.getIdNumber()));
                }

                // 然后设置到partyMember对象中
                 partyMember.setDistricts(districtName);
                 partyMember.setDistrictsCode(districtCode);
                 partyMember.setStreet(streetName);
                 partyMember.setStreetId(streetId);
                 partyMember.setCommunity(communityName);
                 partyMember.setCommunityId(communityId);

                validPartyMembers.add(partyMember);
            }
        }

        // 处理验证成功的数据
        if (!validPartyMembers.isEmpty()) {
            // 批量保存
            saveBatch(validPartyMembers);
        }

        // 返回验证失败的数据
        return failedList;
    }

    @Override
@@ -199,4 +360,15 @@
        return (genderDigit % 2 == 0) ? 0 : 1;
    }

}

    /**
     * 根据电话号码查询有效的党员数据
     * @param phone
     * @return
     */
    @Override
    public PartyMember getPartyMemberByPhone(String phone) {
        PartyMember one = this.getOne(new LambdaQueryWrapper<PartyMember>().eq(PartyMember::getPhone, phone)
                .eq(PartyMember::getAuditStatus, 1).eq(PartyMember::getFreezeStatus, 0).eq(PartyMember::getDelFlag, 0));
        return one;
    }}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

@@ -3,25 +3,36 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.beust.jcommander.internal.Lists;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
import com.panzhihua.sangeshenbian.service.IComActService;
import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.warpper.SystemUserList;
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
 * @Date 2025/2/18 22:30
 */
@Service
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemUser> implements ISystemUserService {
	
    private final IComActService comActService;
    /**
     * 获取列表数据
     * @param query
@@ -94,4 +105,47 @@
    public List<RegionVO> getCommunity(String streetId) {
        return this.baseMapper.getCommunity(streetId);
    }

    /**
     * 获取区县-街道-社区树
     * @return
     */
    @Override
    public List<RegionVO> getRegionTree(SystemUserVo loginUserInfo) {
        Integer accountLevel = loginUserInfo.getAccountLevel();
        List<RegionVO> regionTree = new ArrayList<>();
        switch (accountLevel) {
            case 1:
                regionTree = baseMapper.getRegion("510400");
                baseMapper.getStreet("510400");
                regionTree.forEach(district -> {
                    List<RegionVO> streets = baseMapper.getStreet(district.getId());
                    district.setChildren(streets);
                    streets.forEach(street -> {
                        List<RegionVO> communities = baseMapper.getCommunity(street.getId());
                        street.setChildren(communities);
                    });
                });
                break;
            case 2:
                regionTree = baseMapper.getStreet(loginUserInfo.getDistrictsCode());
                regionTree.forEach(regionVO->{
                    List<RegionVO> communities = baseMapper.getCommunity(regionVO.getId());
                    regionVO.setChildren(communities);
                });
                break;
            case 3:
                regionTree = baseMapper.getCommunity(loginUserInfo.getStreetId());
                break;
            case 4:
                ComAct byId = comActService.getById(loginUserInfo.getCommunityId());
                RegionVO regionVO = new RegionVO();
                regionVO.setId(byId.getCommunityId().toString());
                regionVO.setName(byId.getName());
                regionTree = Lists.newArrayList(regionVO);
                break;
        }

        return regionTree;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/utils/FileUtil.java

New file
@@ -0,0 +1,34 @@
package com.panzhihua.sangeshenbian.utils;

import java.io.File;
import java.io.InputStream;
 
public class FileUtil {
    public static InputStream getResourcesFileInputStream(String fileName) {
        return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName);
    }
 
    public static String getPath() {
        return FileUtil.class.getResource("/").getPath();
    }
 
    public static File createNewFile(String pathName) {
        File file = new File(getPath() + pathName);
        if (file.exists()) {
            file.delete();
        } else {
            if (!file.getParentFile().exists()) {
                file.getParentFile().mkdirs();
            }
        }
        return file;
    }
 
    public static File readFile(String pathName) {
        return new File(getPath() + pathName);
    }
 
    public static File readUserHomeFile(String pathName) {
        return new File(System.getProperty("user.home") + File.separator + pathName);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java

New file
@@ -0,0 +1,43 @@
package com.panzhihua.sangeshenbian.warpper;

import com.baomidou.mybatisplus.annotation.TableField;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;

/**
 * @author mitao
 * @date 2025/3/15
 */
@Data
@ApiModel("管理后台诉求管理查询数据传输对象")
public class MgtComplaintQuery extends BasePage {
    @ApiModelProperty(value = "录入人")
    private String nickname;

    @ApiModelProperty(value = "联系方式")
    private String phone;

    @ApiModelProperty(value = "群众姓名")
    private String name;

    @ApiModelProperty(value = "发生时间-开始")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

    @ApiModelProperty(value = "发生时间-结束")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    @ApiModelProperty(value = "问题类型")
    private String problemType;

    @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
    private Integer status;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberImportFailedVO.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.sangeshenbian.warpper;

import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author mitao
 * @date 2025/3/15
 */
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("党员导入失败信息视图对象")
public class PartyMemberImportFailedVO extends PartyMemberTemplate {
    @ApiModelProperty(value = "失败原因")
    private String failReason;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@
        enabled: true
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
      uri: http://${CONFIG_URL:192.168.110.188}:6193/
  profiles:
    active: ${ENV:dev}
  servlet:
@@ -20,7 +20,7 @@
eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
      defaultZone: http://${EUREKA_URL:192.168.110.188}:8192/eureka

#实体加密、解密、字段脱敏拦截设置
domain:

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml

@@ -119,55 +119,26 @@
        scar.department_name,
        scar.department_id
        FROM sgsb_complaint sc
        INNER JOIN sgsb_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1 and scar.superior_id = #{targetId}
        INNER JOIN sgsb_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1
        <where>
            scar.latest_flag = 1
            <if test="null != accountLevel and accountLevel == 5">
                and scar.report_type = 5 and scar.superior_id = #{targetId}
                <if test="query.type == 0">
                    and scar.audit_type != 0 AND scar.audit_status = 0
                </if>
            <if test="1 == accountLevel">
                and sc.city_code = #{targetId}
            </if>
            <if test="null != accountLevel and accountLevel == 4">
                <if test="query.type==null">
                    and (
                    (scar.report_type = 4 and scar.superior_id = #{targetId}) or (scar.report_type = 4 and scar.superior_id = #{targetId})
                    or ( scar.audit_type != 0 AND scar.audit_status != 1 and scar.report_type = 4 and scar.superior_id =  #{targetId})
                    )
                </if>
                <if test="query.type == 0">
                    and ( scar.audit_type != 0 AND scar.audit_status = 0 and scar.report_type = 4 and scar.superior_id =  #{targetId})
                </if>
            <if test="2 == accountLevel">
                and (sc.districts_code = #{targetId} || sc.id in (select complaint_id from sgsb_complaint_audit_record where audit_type = 3 and audit_status = 1 and report_type = #{accountLevel} and superior_id = #{targetId}))
            </if>
            <if test="null != accountLevel and accountLevel == 3">
                <if test="query.type==null">
                    and (
                    (scar.report_type = 3 and scar.superior_id = #{targetId}) or (scar.report_type = 3 and scar.superior_id = #{targetId})
                    or (scar.audit_type != 0 AND scar.audit_status != 1 and scar.report_type = 3 and scar.superior_id =  #{targetId})
                    )
                </if>
                <if test="query.type == 0">
                    and (scar.audit_type != 0 AND scar.audit_status = 0 and scar.report_type = 3 and scar.superior_id =  #{targetId})
                </if>
            <if test="null != streetId">
                and (sc.street_id = #{streetId} || sc.id in (select complaint_id from sgsb_complaint_audit_record where audit_type = 3 and audit_status = 1 and report_type = #{accountLevel} and superior_id = #{targetId}))
            </if>
            <if test="null != accountLevel and accountLevel == 2">
                <if test="query.type==null">
                    and ((scar.report_type = 2 and scar.superior_id = #{targetId}) or (scar.report_type = 2 and scar.superior_id = #{targetId})
                    or (scar.audit_type != 0 AND scar.audit_status != 1 and scar.report_type = 2 and scar.superior_id =  #{targetId})
                    )
                </if>
                <if test="query.type == 0">
                    and (scar.audit_type != 0 AND scar.audit_status = 0 and scar.report_type = 2 and scar.superior_id =  #{targetId})
                </if>
            <if test="null != communityId">
                and (sc.community_id = #{communityId} || sc.id in (select complaint_id from sgsb_complaint_audit_record where audit_type = 3 and audit_status = 1 and report_type = #{accountLevel} and superior_id = #{targetId}))
            </if>
            <if test="null != accountLevel and accountLevel == 1">
                <if test="query.type == null">
                    and ((scar.report_type = 1 and scar.superior_id = #{targetId}) or (scar.report_type = 1 and scar.superior_id = #{targetId})
                    or (scar.audit_type != 0 AND scar.audit_status != 1 and scar.report_type = 1 and scar.superior_id =  #{targetId}))
                </if>
                <if test="query.type == 0">
                    and (scar.audit_type != 0 AND scar.audit_status = 0 and scar.report_type = 1 and scar.superior_id =  #{targetId})
                </if>
            <if test="null != partyMemberId">
                and (sc.party_member_id = #{partyMemberId} || sc.id in (select complaint_id from sgsb_complaint_audit_record where audit_type = 3 and audit_status = 1 and report_type = #{accountLevel} and superior_id = #{targetId}))
            </if>
            <if test="query.type!=null and query.type == 0">
                AND sc.status IN(0,1,2) and scar.audit_status = 0
            </if>
            <if test="query.type!=null and query.type == 1">
                AND sc.status IN(0,1,2) and scar.audit_status != 0
@@ -239,8 +210,7 @@
        ifnull((select b.phone from sgsb_complaint_audit_record a left join sys_user b on (a.create_by = b.user_id) where a.audit_status != 0 and a.complaint_id = #{id} order by a.sort desc limit 0, 1), "") AS auditorPhone
        FROM sgsb_complaint sc
        LEFT JOIN sys_user su ON su.user_id = sc.create_by
        LEFT JOIN sgsb_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1 and scar.superior_id = #{targetId}
        LEFT JOIN sys_user su2 ON su2.user_id = scar.auditor_id AND scar.audit_status != 0
        LEFT JOIN sgsb_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1
        <where>
            sc.id = #{id}
        </where>
@@ -263,4 +233,15 @@
        </where>
        ORDER BY sc.create_time DESC
    </select>
    <select id="pageList" resultType="com.panzhihua.sangeshenbian.model.vo.ComplaintVO">

    </select>
    <select id="getList" resultType="com.panzhihua.sangeshenbian.model.vo.ComplaintVO">

    </select>
    
    
    <select id="getTimeoutAndNotComment" resultType="com.panzhihua.sangeshenbian.model.entity.Complaint">
        select * from sgsb_complaint where status = 3 and DATE_ADD(completion_time, INTERVAL 10 DAY) &lt;= NOW() and id not in (select complaint_id from sgsb_complaint_comment where del_flag = 0)
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml

@@ -37,7 +37,7 @@
                and street_id = #{loginUserInfo.streetId}
            </if>
            <if test="loginUserInfo.accountLevel==4">
                and street_id = #{loginUserInfo.streetId}
                and community_id = #{loginUserInfo.communityId}
            </if>
            <if test="query.name != null and query.name != ''">
                and name like concat('%',#{query.name},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/template/社区问题单.docx

Binary files differ