From 4082584bb531cb39e2e53343fbaf4a9c18cc4b35 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 6 Feb 2026 18:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=B6=85=E5=B8=82--=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E8=B6=85=E5=B8=82=E5=8A=A0=E4=B8=8A=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/pojo/dto/NegativeDto.java | 25 +++++++++++++++++++ .../supervision/pojo/entity/Negative.java | 23 +++++++++++++++++ .../supervision/service/ModelClueService.java | 18 ++++++++++--- .../supervision/service/NegativeService.java | 12 +++++++++ 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java b/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java index 6607be8..da16d23 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java @@ -1,10 +1,12 @@ package com.biutag.supervision.pojo.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.biutag.supervision.common.validation.AddGroup; import com.biutag.supervision.common.validation.EditGroup; import com.biutag.supervision.pojo.dto.flow.VerifyData; import com.biutag.supervision.pojo.vo.FileVo; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -114,4 +116,27 @@ public class NegativeDto { // 下发问题 private List problems; + + /** + * @see com.biutag.supervision.pojo.enums.negative.NegativeSourceTypeEnum + */ + @Schema(description = "来源类型代码") + private String sourceType; + + + /** + * @see com.biutag.supervision.pojo.enums.negative.NegativeSourceTypeEnum + */ + @Schema(description = "来源类型描述") + private String sourceTypeDesc; + + @Schema(description = "下发单位id") + @TableField("issuingDepartId") + private String issuingDepartId; + + @Schema(description = "下发单位名字") + @TableField("issuingDepartName") + private String issuingDepartName; + + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java index 2ae26e1..dc8114f 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -347,4 +348,26 @@ public class Negative { // 处分处理情况 private String disciplinaryActionDesc; + /** + * @see com.biutag.supervision.pojo.enums.negative.NegativeSourceTypeEnum + */ + @Schema(description = "来源类型") + @TableField("sourceType") + private String sourceType; + + /** + * @see com.biutag.supervision.pojo.enums.negative.NegativeSourceTypeEnum + */ + @Schema(description = "来源类型名称") + @TableField("sourceTypeDesc") + private String sourceTypeDesc; + + + @Schema(description = "下发单位id") + @TableField("issuingDepartId") + private String issuingDepartId; + + @Schema(description = "下发单位名字") + @TableField("issuingDepartName") + private String issuingDepartName; } diff --git a/src/main/java/com/biutag/supervision/service/ModelClueService.java b/src/main/java/com/biutag/supervision/service/ModelClueService.java index d764157..fe42203 100644 --- a/src/main/java/com/biutag/supervision/service/ModelClueService.java +++ b/src/main/java/com/biutag/supervision/service/ModelClueService.java @@ -12,6 +12,7 @@ import com.biutag.supervision.mapper.*; import com.biutag.supervision.pojo.dto.ModelClueTaskDistribute; import com.biutag.supervision.pojo.dto.NegativeDto; import com.biutag.supervision.pojo.entity.*; +import com.biutag.supervision.pojo.enums.negative.NegativeSourceTypeEnum; import com.biutag.supervision.pojo.model.ModelClueModel; import com.biutag.supervision.pojo.param.ModelClueQueryParam; import com.biutag.supervision.pojo.vo.FileVo; @@ -160,9 +161,20 @@ public class ModelClueService extends ServiceImpl { } NegativeDto negative = new NegativeDto(); // 问题来源 - negative.setProblemSources(ProblemSourcesEnum.LMGZ.getLabel()); - negative.setProblemSourcesCode(ProblemSourcesEnum.LMGZ.getValue()); - +// negative.setProblemSources(ProblemSourcesEnum.LMGZ.getLabel()); +// negative.setProblemSourcesCode(ProblemSourcesEnum.LMGZ.getValue()); + // 1、添加问题来源 + ProblemSourcesEnum problemSourcesEnum = ProblemSourcesEnum.get(model.getProblemSourcesCode()); + if (null != problemSourcesEnum){ + negative.setProblemSources(problemSourcesEnum.getLabel()); + negative.setProblemSourcesCode(problemSourcesEnum.getValue()); + } + // 2、negative表添加一个字段，表示是从模型超市来的问题 + negative.setSourceType(NegativeSourceTypeEnum.MODEL_MARKET.getCode()); + negative.setSourceTypeDesc(NegativeSourceTypeEnum.MODEL_MARKET.getDesc()); + // 3、 取模型的创建单位为下发单位 + negative.setIssuingDepartId(model.getCreateDepartId()); + negative.setIssuingDepartName(model.getCreateDepartName()); if (StrUtil.isNotBlank(model.getBusinessTypeCode())) { negative.setBusinessTypeCode(model.getBusinessTypeCode()); } else { diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index 4b8ff5b..ccc782a 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -227,6 +227,15 @@ public class NegativeService extends ServiceImpl { if (CollectionUtil.isNotEmpty(negativeDto.getProblems())) { negative.setProblems(JSON.toJSONString(negativeDto.getProblems())); } + if (negative.getIssuingDepartId() == null) { + try { + UserAuth user = UserContextHolder.getCurrentUser(); + negative.setIssuingDepartId(user.getDepartId()); + negative.setIssuingDepartName(user.getDepartName()); + } catch (NullPointerException e) { + log.warn("未获取到用户上下文，问题ID：{}", negative.getId()); + } + } save(negative); // 添加一条 negative 数据 negativeDto.setId(negative.getId()); if (!negativeDto.getThingFiles().isEmpty()) { @@ -328,6 +337,9 @@ public class NegativeService extends ServiceImpl { .setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); } } + // jwpy直接算现场督察大队 + negative.setIssuingDepartId("2788"); + negative.setIssuingDepartName("现场督察大队"); save(negative); // 新增work String departId;