update 标准征求意见流程-查询条款列表

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
+import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
@@ -103,9 +104,13 @@ public class LawsAssess implements Serializable {
     @ApiModelProperty(value = "评估结果")
     private String evaluationResults;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "分解单来源列表")
+    private List<DecompositionOrderSourceVO> decompositionOrderSourceVOList;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "分解单来源")
-    private List<Map<String, String>> decompositionOrderSource;
+    private DecompositionOrderSourceVO decompositionOrderSourceVO;
 
     @TableField(exist = false)
     @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true)

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java

@@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.projectLibrary.entity.LawsAssess;
 import com.jero.modules.projectLibrary.mapper.LawsAssessMapper;
 import com.jero.modules.projectLibrary.service.ILawsAssessService;
+import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -195,18 +196,18 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 
 			Map<String, String> flagMap = new HashMap<>();
 			List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
-			List<Map<String, String>>mapList = new ArrayList<>();
+			List<DecompositionOrderSourceVO>mapList = new ArrayList<>();
 			sarFileSplitInfoEOList.forEach(e -> flagMap.put(e.getFileType(), e.getId()));
 			for (DictModel dictModel : dictModels) {
 				String text = dictModel.getText();
 				String value = dictModel.getValue();
-				Map<String, String> map = new HashMap<>();
-				map.put("text",text);
-				map.put("value",value);
-				map.put("sarFileSplitInfoId",flagMap.get(value));
-				mapList.add(map);
+				DecompositionOrderSourceVO decompositionOrderSourceVO = new DecompositionOrderSourceVO();
+				decompositionOrderSourceVO.setText(text);
+				decompositionOrderSourceVO.setValue(value);
+				decompositionOrderSourceVO.setSarFileSplitInfoId(flagMap.get(value));
+				mapList.add(decompositionOrderSourceVO);
 			}
-			assess.setDecompositionOrderSource(mapList);
+			assess.setDecompositionOrderSourceVOList(mapList);
 		}
 	}
 }

laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/DecompositionOrderSourceVO.java

@@ -0,0 +1,19 @@
+package com.jero.modules.projectLibrary.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分解单来源
+ * @author liJiaRao
+ * @date 2023-12-13 11:03
+ */
+@Data
+public class DecompositionOrderSourceVO {
+    @ApiModelProperty(value = "名称")
+    private String text;
+    @ApiModelProperty(value = "字典值")
+    private String value;
+    @ApiModelProperty(value = "拆分单id")
+    private String sarFileSplitInfoId;
+}