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

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java

@@ -1,12 +1,15 @@
 package com.jero.modules.activiti.process.projectassess.controller;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
+import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
 import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessService;
 import com.jero.common.api.vo.ResultCommon;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -14,6 +17,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
+import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
+import com.jero.modules.projectLibrary.entity.LawsAssess;
+import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.apache.poi.ss.formula.functions.T;
@@ -51,6 +57,8 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
      */
     @Resource
     private ProcessProjectAssessService processProjectAssessService;
+    @Resource
+    private IDocumentSplitService documentSplitService;
 
     @DictPoint
     @GetMapping("/queryProcessInfoVO")
@@ -98,4 +106,33 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
         return Result.OK();
     }
 
+    /**
+     * 标准征求意见流程-查询条款列表
+     * @return
+     */
+    @ApiOperation(value = "标准征求意见流程-查询条款列表")
+    @GetMapping("/processProjectAssessGetList")
+    @ApiOperationSupport(order = 21)
+    public Result<List<ProcessProjectAssessTerm>> processProjectAssessGetList(List<LawsAssess> lawsAssessList) {
+        List<ProcessProjectAssessTerm> allList = new ArrayList<>();
+        for (LawsAssess lawsAssess : lawsAssessList) {
+            DecompositionOrderSourceVO decompositionOrderSourceVO = lawsAssess.getDecompositionOrderSourceVO();
+            if (decompositionOrderSourceVO != null){
+                String sarFileSplitInfoId = decompositionOrderSourceVO.getSarFileSplitInfoId();
+                if (StringUtils.isNotBlank(sarFileSplitInfoId)){
+                    List<ProcessProjectAssessTerm> processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId);
+                    allList.addAll(processProjectAssessTermList);
+                    continue;
+                }
+                ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
+                processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
+                processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
+                processProjectAssessTerm.setCanAssignFlag(false);
+                allList.add(processProjectAssessTerm);
+            }
+
+        }
+        return Result.OK(allList);
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java

@@ -91,5 +91,9 @@ public class ProcessProjectAssessTerm {
     @ApiModelProperty(value = "条款内容")
     private String termText;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "可以分派标识")
+    private Boolean canAssignFlag;
+
 
 }

laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java

@@ -391,32 +391,7 @@ public class DocumentSplitController {
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
-    /**
+
-     * 标准征求意见流程-查询条款列表
-     * @param ids
-     * @return
-     */
-    @ApiOperation(value = "标准征求意见流程-查询条款列表")
-    @GetMapping("/processProjectAssessGetList")
-    @ApiOperationSupport(order = 21)
-    public Result<IPage<ProcessProjectAssessTerm>> processProjectAssessGetList(String ids,
-                                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-        List<ProcessProjectAssessTerm> processProjectAssessTermList = documentSplitService.processProjectAssessGetList(ids);
-        IPage<ProcessProjectAssessTerm> info = new Page<>();
-        int total = processProjectAssessTermList.size();
-        if(total>0) {
-            if (total <= pageNo * pageSize) {
-                info.setRecords(processProjectAssessTermList.subList((pageNo-1) * pageSize, total));
-            } else {
-                info.setRecords(processProjectAssessTermList.subList((pageNo-1) * pageSize, pageNo * pageSize));
-            }
-        }
-        info.setCurrent(pageNo);
-        info.setSize(pageSize);
-        info.setTotal(total);
-        return Result.OK(info);
-    }
 
     /**
      * 标准拆分详情-模板下载

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -986,6 +986,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id);
             processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
             processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
+            processProjectAssessTerm.setCanAssignFlag(false);
             processProjectAssessTermList.add(processProjectAssessTerm);
             // 文档拆分详情
             Map<String, Object> parameter = new HashMap<>();
@@ -996,6 +997,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                 processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num")));
                 processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title")));
                 processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content")));
+                processProjectAssessTerm1.setCanAssignFlag(true);
                 processProjectAssessTermList.add(processProjectAssessTerm1);
             }
         }

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<>();
+				DecompositionOrderSourceVO decompositionOrderSourceVO = new DecompositionOrderSourceVO();
-				map.put("text",text);
+				decompositionOrderSourceVO.setText(text);
-				map.put("value",value);
+				decompositionOrderSourceVO.setValue(value);
-				map.put("sarFileSplitInfoId",flagMap.get(value));
+				decompositionOrderSourceVO.setSarFileSplitInfoId(flagMap.get(value));
-				mapList.add(map);
+				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;
+}