模型超市--模型超市加上下发单位

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<VerifyData.Problem> 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;
+
+
 }

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;
 }

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<ModelClueMapper, ModelClue> {
             }
             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 {

src/main/java/com/biutag/supervision/service/NegativeService.java

@@ -227,6 +227,15 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
         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<NegativeMapper, Negative> {
                             .setCurrentProcessingObject(String.format("%s专班", dept.getShortName()));
                 }
             }
+            // jwpy直接算现场督察大队
+            negative.setIssuingDepartId("2788");
+            negative.setIssuingDepartName("现场督察大队");
             save(negative);
             // 新增work
             String departId;