Commit bd5cf129 authored by wdy's avatar wdy

根据任务id查询留档文件列表&查看留档文件详情

parent 1309e153
...@@ -86,8 +86,5 @@ public class ReviewDetailsResult implements Serializable { ...@@ -86,8 +86,5 @@ public class ReviewDetailsResult implements Serializable {
@ApiModelProperty("关联到车企留档文件") @ApiModelProperty("关联到车企留档文件")
private Long reviewEnterpriseArchiveId; private Long reviewEnterpriseArchiveId;
@TableField(exist = false)
@ApiModelProperty("文件名称")
private String fileName;
} }
...@@ -28,7 +28,7 @@ public interface ReviewEnterpriseArchiveMapper extends BaseMapper<ReviewEnterpri ...@@ -28,7 +28,7 @@ public interface ReviewEnterpriseArchiveMapper extends BaseMapper<ReviewEnterpri
ReviewEnterpriseArchive findByFileName(@Param("fileName") String fileName); ReviewEnterpriseArchive findByFileName(@Param("fileName") String fileName);
List<String> findFileNameList(@Param("taskId") Long taskId); List<ReviewEnterpriseArchive> findList(@Param("taskId") Long taskId);
} }
......
...@@ -35,5 +35,5 @@ public interface ReviewEnterpriseArchiveService extends IService<ReviewEnterpris ...@@ -35,5 +35,5 @@ public interface ReviewEnterpriseArchiveService extends IService<ReviewEnterpris
*/ */
ReviewEnterpriseArchive getInfo(ReviewEnterpriseArchiveGetInfoRequest request); ReviewEnterpriseArchive getInfo(ReviewEnterpriseArchiveGetInfoRequest request);
List<String> findFileNameList(ReviewEnterpriseArchiveFindFileNameListRequest request); List<ReviewEnterpriseArchive> findList(ReviewEnterpriseArchiveFindFileNameListRequest request);
} }
...@@ -79,12 +79,13 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp ...@@ -79,12 +79,13 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
@Override @Override
public ReviewEnterpriseArchive getInfo(ReviewEnterpriseArchiveGetInfoRequest request) { public ReviewEnterpriseArchive getInfo(ReviewEnterpriseArchiveGetInfoRequest request) {
return reviewEnterpriseArchiveMapper.findByFileName(request.getFileName()); return reviewEnterpriseArchiveMapper.selectById(request.getId());
} }
@Override @Override
public List<String> findFileNameList(ReviewEnterpriseArchiveFindFileNameListRequest request) { public List<ReviewEnterpriseArchive> findList(ReviewEnterpriseArchiveFindFileNameListRequest request) {
return reviewEnterpriseArchiveMapper.findFileNameList(request.getTaskId()); return reviewEnterpriseArchiveMapper.findList(request.getTaskId());
} }
private List<ReviewEnterpriseArchiveViewVO> buildReviewEnterpriseArchiveViewVO(List<ReviewEnterpriseArchive> archives, List<ReviewEnterpriseArchiveViewItemVO> viewItems) { private List<ReviewEnterpriseArchiveViewVO> buildReviewEnterpriseArchiveViewVO(List<ReviewEnterpriseArchive> archives, List<ReviewEnterpriseArchiveViewItemVO> viewItems) {
......
...@@ -39,7 +39,7 @@ public class ReviewEnterpriseArchiveController extends BaseController { ...@@ -39,7 +39,7 @@ public class ReviewEnterpriseArchiveController extends BaseController {
return getDataTable(reviewEnterpriseArchiveService.findEnterpriseArchive(request)); return getDataTable(reviewEnterpriseArchiveService.findEnterpriseArchive(request));
} }
@ApiOperation("根据名称查询") @ApiOperation("根据id查询")
@Trace @Trace
@Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")}) @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@RequestMapping(method = RequestMethod.POST, value = "/getInfo") @RequestMapping(method = RequestMethod.POST, value = "/getInfo")
...@@ -49,12 +49,12 @@ public class ReviewEnterpriseArchiveController extends BaseController { ...@@ -49,12 +49,12 @@ public class ReviewEnterpriseArchiveController extends BaseController {
return R.ok(reviewEnterpriseArchive); return R.ok(reviewEnterpriseArchive);
} }
@ApiOperation("查询文件名称列表") @ApiOperation("查询车企文件列表")
@Trace @Trace
@Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")}) @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@RequestMapping(method = RequestMethod.POST, value = "/findFileNameList") @RequestMapping(method = RequestMethod.POST, value = "/findList")
public TableDataInfo<String> findFileNameList(@Validated @RequestBody ReviewEnterpriseArchiveFindFileNameListRequest request) { public TableDataInfo<ReviewEnterpriseArchive> findList(@Validated @RequestBody ReviewEnterpriseArchiveFindFileNameListRequest request) {
return getDataTable(reviewEnterpriseArchiveService.findFileNameList(request)); return getDataTable(reviewEnterpriseArchiveService.findList(request));
} }
@ApiOperation("新增车企文件") @ApiOperation("新增车企文件")
......
...@@ -8,6 +8,6 @@ import lombok.Data; ...@@ -8,6 +8,6 @@ import lombok.Data;
@Data @Data
public class ReviewEnterpriseArchiveGetInfoRequest { public class ReviewEnterpriseArchiveGetInfoRequest {
@ApiModelProperty("文件名称") @ApiModelProperty("id")
private String fileName; private Long id;
} }
...@@ -60,8 +60,9 @@ ...@@ -60,8 +60,9 @@
FROM t_review_enterprise_archive FROM t_review_enterprise_archive
where file_name = #{fileName} where file_name = #{fileName}
</select> </select>
<select id="findFileNameList" resultType="java.lang.String"> <select id="findList" resultType="com.ruoyi.domain.ReviewEnterpriseArchive">
select file_name from t_review_enterprise_archive SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
FROM t_review_enterprise_archive
where task_id = #{taskId} where task_id = #{taskId}
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment