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

luofl

2025-04-02 23802d7e53c2175db9bd8c6d7d9fc49f0b2e41d4

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

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

@@ -60,7 +60,7 @@
    public void communityProblem(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id,
                                 @ApiParam(name = "type", value = "类型：1：社区问题单 2：问题处理单 3：协调通知单", required = true) @PathVariable("type") Integer type) {
        try {
            complaintService.downloadFile(id, type);
            complaintService.downloadFile(id, type,getLoginUserInfoSanGeShenBian());
        } catch (IOException e) {
            throw new RuntimeException(e);
        }

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

@@ -137,9 +137,11 @@

    /**
     * 社区问题单、问题处理单、协调通知单 下载
     *
     * @param id
     * @param loginUserInfo
     */
    void downloadFile(Long id, Integer type) throws IOException;
    void downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException;

    /**
     * 获取超时未评价的数据

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

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

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.idev.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -29,15 +28,13 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.*;
import com.panzhihua.sangeshenbian.utils.FileUtil;
import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
import jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.connection.RedisServer;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -1122,7 +1119,7 @@
    }

    @Override
    public void downloadFile(Long id, Integer type) throws IOException {
    public void downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
        Complaint complaint = baseMapper.getDetailBg(id);
        if (Objects.isNull(complaint)) {
            throw new ServiceException("该诉求不存在");
@@ -1177,7 +1174,9 @@
            case 2:
                fileName = "question_handle.docx";
                if (Objects.nonNull(partyMember)) {
                    community = community + "-" + partyMember.getServiceTarget();
                    if (StringUtil.isNotBlank(partyMember.getServiceTarget())) {
                        community = community + "-" + partyMember.getServiceTarget();
                    }
                }
                reportType = complaint.getCompletionUserLevel();
                break;
@@ -1199,7 +1198,9 @@
        map.put("problemType", complaint.getProblemType());
        map.put("descriptionContent", complaint.getDescriptionContent());
        map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
        map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
        if (Objects.nonNull(partyMember)) {
            map.put("partyOrganization", StringUtil.isNotBlank(partyMember.getPartyOrganization()) ? partyMember.getPartyOrganization() : "");
        }
        map.put("name", complaint.getName());
        map.put("contactNumber", complaint.getContactNumber());
        map.put("nickname", complaint.getReportUserName());
@@ -1222,6 +1223,7 @@
            if (Objects.nonNull(complaintComment)) {
                map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()).getDesc());
            }
            map.put("departmentLevel", ReportTypeEnum.getDescriptionByCode(loginUserInfo.getAccountLevel()) + "级");
        }
        response.setContentType("application/octet-stream");
        String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/template/question_handle.docx

Binary files differ