add 法规合规评估流程 查询条款列表
This commit is contained in:
+35
-1
@@ -1,8 +1,14 @@
|
|||||||
package com.jero.modules.activiti.process.projectstandard.controller;
|
package com.jero.modules.activiti.process.projectstandard.controller;
|
||||||
|
|
||||||
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||||
|
import com.jero.common.api.vo.ResultCommon;
|
||||||
import com.jero.common.aspect.annotation.DictPoint;
|
import com.jero.common.aspect.annotation.DictPoint;
|
||||||
|
import com.jero.common.constant.enums.YesOrNoEnum;
|
||||||
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
|
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
|
||||||
import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard;
|
import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard;
|
||||||
|
import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm;
|
||||||
import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService;
|
import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
@@ -11,8 +17,11 @@ import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStanda
|
|||||||
import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO;
|
import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO;
|
||||||
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
|
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
|
||||||
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
|
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
|
||||||
|
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
|
||||||
|
import com.jero.modules.projectLibrary.entity.LawsAssess;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
@@ -25,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
|
|||||||
import com.jero.common.aspect.annotation.AutoLog;
|
import com.jero.common.aspect.annotation.AutoLog;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 法规合规评估流程表(process_project_standard)表控制层
|
* 法规合规评估流程表(process_project_standard)表控制层
|
||||||
@@ -34,13 +45,15 @@ import javax.annotation.Resource;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Api(tags = "法规合规评估流程表")
|
@Api(tags = "法规合规评估流程表")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("ProcessProjectStandard")
|
@RequestMapping("processProjectStandard")
|
||||||
public class ProcessProjectStandardController extends JeroController<ProcessProjectStandard, ProcessProjectStandardService> {
|
public class ProcessProjectStandardController extends JeroController<ProcessProjectStandard, ProcessProjectStandardService> {
|
||||||
/**
|
/**
|
||||||
* 服务对象
|
* 服务对象
|
||||||
*/
|
*/
|
||||||
@Resource
|
@Resource
|
||||||
private ProcessProjectStandardService processProjectStandardService;
|
private ProcessProjectStandardService processProjectStandardService;
|
||||||
|
@Resource
|
||||||
|
private IDocumentSplitService documentSplitService;
|
||||||
|
|
||||||
|
|
||||||
@DictPoint
|
@DictPoint
|
||||||
@@ -97,6 +110,7 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
|
|||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@AutoLog(value = "未符合项跟踪流程-查询标准列表")
|
||||||
@ApiOperation(value="查询标准列表")
|
@ApiOperation(value="查询标准列表")
|
||||||
@GetMapping(value = "/quaryStandard")
|
@GetMapping(value = "/quaryStandard")
|
||||||
public Result<IPage<StandardSelectionVO>> quaryStandard(ManyStandardSelectionBoxVO selectionBoxVO,
|
public Result<IPage<StandardSelectionVO>> quaryStandard(ManyStandardSelectionBoxVO selectionBoxVO,
|
||||||
@@ -105,5 +119,25 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
|
|||||||
return Result.OK(processProjectStandardService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
return Result.OK(processProjectStandardService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 项目合规评估流程-查询条款列表
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目合规评估流程-查询条款列表")
|
||||||
|
@ApiOperation(value = "查询条款列表")
|
||||||
|
@PostMapping("/processProjectStandardGetList")
|
||||||
|
public Result<List<ProcessProjectStandardTerm>> processProjectStandardGetList(@RequestBody ProcessProjectStandard processProjectStandard) {
|
||||||
|
String sarFileSplitInfoId = processProjectStandard.getSarFileSplitInfoId();
|
||||||
|
List<ProcessProjectStandardTerm> allList = new ArrayList<>();
|
||||||
|
if (StringUtils.isNotBlank(sarFileSplitInfoId)) {
|
||||||
|
List<ProcessProjectStandardTerm> termList = documentSplitService.processProjectStandardGetList(sarFileSplitInfoId);
|
||||||
|
termList.forEach(item -> item.setStandardId(processProjectStandard.getStandardId()));
|
||||||
|
allList.addAll(termList);
|
||||||
|
}else {
|
||||||
|
throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
|
||||||
|
}
|
||||||
|
return Result.OK(allList);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -105,4 +105,8 @@ public class ProcessProjectStandard {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "分解单来源列表")
|
@ApiModelProperty(value = "分解单来源列表")
|
||||||
private List<DecompositionOrderSourceVO> decompositionOrderSourceVOList;
|
private List<DecompositionOrderSourceVO> decompositionOrderSourceVOList;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "拆分单id")
|
||||||
|
private String sarFileSplitInfoId;
|
||||||
}
|
}
|
||||||
+5
@@ -2,6 +2,7 @@ package com.jero.modules.laws.documenttool.service;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
|
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
|
||||||
|
import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm;
|
||||||
import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
|
import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
|
||||||
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
|
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
|
||||||
import com.jero.modules.laws.documenttool.entity.SplitFileInfo;
|
import com.jero.modules.laws.documenttool.entity.SplitFileInfo;
|
||||||
@@ -165,6 +166,8 @@ public interface IDocumentSplitService {
|
|||||||
|
|
||||||
List<ProcessProjectAssessTerm> processProjectAssessGetList(String ids);
|
List<ProcessProjectAssessTerm> processProjectAssessGetList(String ids);
|
||||||
|
|
||||||
|
List<ProcessProjectStandardTerm> processProjectStandardGetList(String sarFileSplitInfoId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文档拆分-发布
|
* 文档拆分-发布
|
||||||
* @param parameter
|
* @param parameter
|
||||||
@@ -206,4 +209,6 @@ public interface IDocumentSplitService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void isHorizontalOverstep(String ids);
|
void isHorizontalOverstep(String ids);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+27
@@ -17,6 +17,7 @@ import com.jero.common.util.MessageUtils;
|
|||||||
import com.jero.common.util.UUIDUtils;
|
import com.jero.common.util.UUIDUtils;
|
||||||
import com.jero.common.util.ZipUtil;
|
import com.jero.common.util.ZipUtil;
|
||||||
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
|
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
|
||||||
|
import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm;
|
||||||
import com.jero.modules.laws.common.constant.FieldCommon;
|
import com.jero.modules.laws.common.constant.FieldCommon;
|
||||||
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
|
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
|
||||||
import com.jero.modules.laws.documenttool.common.DirectoryComparator;
|
import com.jero.modules.laws.documenttool.common.DirectoryComparator;
|
||||||
@@ -1028,6 +1029,32 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
return processProjectAssessTermList;
|
return processProjectAssessTermList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ProcessProjectStandardTerm> processProjectStandardGetList(String sarFileSplitInfoId) {
|
||||||
|
List<ProcessProjectStandardTerm> processProjectAssessTermList = new ArrayList<>();
|
||||||
|
ProcessProjectStandardTerm term = new ProcessProjectStandardTerm();
|
||||||
|
// 文档拆分信息
|
||||||
|
DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(sarFileSplitInfoId);
|
||||||
|
term.setTermNumber(documentSplitInfo1.getSerialNumber());
|
||||||
|
term.setTermName(documentSplitInfo1.getTitle());
|
||||||
|
term.setSplitInfoId(sarFileSplitInfoId);
|
||||||
|
term.setTermText(documentSplitInfo1.getFileType());
|
||||||
|
processProjectAssessTermList.add(term);
|
||||||
|
// 文档拆分详情
|
||||||
|
Map<String, Object> parameter = new HashMap<>();
|
||||||
|
parameter.put(INFO_ID, sarFileSplitInfoId);
|
||||||
|
List<Map<String, Object>> documentSplitDetailByList = queryDocumentSplitDetailByList(parameter);
|
||||||
|
for (Map<String, Object> map : documentSplitDetailByList) {
|
||||||
|
ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm();
|
||||||
|
term1.setTermNumber(String.valueOf(map.get("item_num")));
|
||||||
|
term1.setTermName(String.valueOf(map.get("item_title")));
|
||||||
|
term1.setTermText(String.valueOf(map.get("item_content")));
|
||||||
|
term1.setSplitInfoId(sarFileSplitInfoId);
|
||||||
|
processProjectAssessTermList.add(term1);
|
||||||
|
}
|
||||||
|
return processProjectAssessTermList;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void publish(Map<String, Object> parameter) {
|
public void publish(Map<String, Object> parameter) {
|
||||||
String id = (String) parameter.get(ID);
|
String id = (String) parameter.get(ID);
|
||||||
|
|||||||
Reference in New Issue
Block a user