fix(征求意见流程): 通过标准id获取过程稿件信息
This commit is contained in:
@@ -3,6 +3,7 @@ package com.jero.modules.oss.entity;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.jero.common.aspect.annotation.Dict;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -27,6 +28,7 @@ public class OSSFile extends JeroEntity {
|
|||||||
private String url;
|
private String url;
|
||||||
|
|
||||||
@Excel(name = "标准文件类型(使用数据库字段名)")
|
@Excel(name = "标准文件类型(使用数据库字段名)")
|
||||||
|
@Dict(dicCode = "process_manuscript")
|
||||||
private String standardFileType;
|
private String standardFileType;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|||||||
+12
-5
@@ -2,25 +2,26 @@ package com.jero.modules.laws.common.controller;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
|
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.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.util.MessageUtils;
|
import com.jero.common.util.MessageUtils;
|
||||||
import com.jero.common.api.vo.ResultCommon;
|
|
||||||
import com.jero.modules.laws.common.service.ILawsCommonService;
|
import com.jero.modules.laws.common.service.ILawsCommonService;
|
||||||
import com.jero.modules.laws.common.vo.LawsDictModel;
|
import com.jero.modules.laws.common.vo.LawsDictModel;
|
||||||
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.oss.service.IOSSFileService;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.split.entity.SarFileSplitInfoEO;
|
import com.jero.modules.split.entity.SarFileSplitInfoEO;
|
||||||
import com.jero.modules.system.util.SysWaterMarkUtil;
|
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -80,4 +81,10 @@ public class LawsCommonController {
|
|||||||
return Result.OK(lawsCommonService.getSplitsByStandardNumber(standardNumber));
|
return Result.OK(lawsCommonService.getSplitsByStandardNumber(standardNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value="通过标准id获取过程稿件信息", notes="通过标准id获取过程稿件信息")
|
||||||
|
@GetMapping(value = "/getFileByStandardId")
|
||||||
|
@DictPoint
|
||||||
|
public Result<List<OSSFile>> getFileByStandardId(String standardId) {
|
||||||
|
return Result.OK(lawsCommonService.getFileByStandardId(standardId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-1
@@ -10,7 +10,6 @@ import com.jero.modules.tag.entity.LawsTag;
|
|||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -230,4 +229,11 @@ public interface ILawsCommonService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Map<String, Object> getInfoByStandardNo(String standardNumber);
|
Map<String, Object> getInfoByStandardNo(String standardNumber);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据标准id获取过程稿件信息
|
||||||
|
* @param standardId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<OSSFile> getFileByStandardId(String standardId);
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-1
@@ -1,7 +1,6 @@
|
|||||||
package com.jero.modules.laws.common.service.impl;
|
package com.jero.modules.laws.common.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.io.FileUtil;
|
import cn.hutool.core.io.FileUtil;
|
||||||
import cn.hutool.core.lang.tree.TreeUtil;
|
|
||||||
import cn.hutool.core.text.CharSequenceUtil;
|
import cn.hutool.core.text.CharSequenceUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
@@ -2821,6 +2820,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OSSFile> getFileByStandardId(String standardId) {
|
||||||
|
return ossFileService.list(new LambdaQueryWrapper<OSSFile>()
|
||||||
|
.eq(OSSFile::getStandardId, standardId));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建企标导入模板的Workbook
|
* 创建企标导入模板的Workbook
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user