fix:企业端分标委

This commit is contained in:
zhangqinlin
2021-12-13 19:15:30 +08:00
parent dca20827eb
commit 5d1096754d
3 changed files with 27 additions and 1 deletions
@@ -3,6 +3,8 @@ package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author zql
* @date 2021/9/28 11:37
@@ -15,4 +17,7 @@ public class Files {
@ApiModelProperty(value = "文件名")
private java.lang.String fileName;
@ApiModelProperty(value = "创建时间")
private Date createTime;
}
@@ -19,6 +19,7 @@
<collection property="files" ofType="com.jero.data.entity.Files" javaType="java.util.List" select="listForChildren" column="{id=id,userId=userId}" >
<result property="fileId" column="fileId"></result>
<result property="fileName" column="fileName"></result>
<result property="createTime" column="createTime"></result>
</collection>
</resultMap>
@@ -26,7 +27,7 @@
SELECT pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_committee pcc where pcc.id=#{id}
</select>
<select id="listForChildren" resultType="com.jero.data.entity.Files">
SELECT ossf.id as fileId,ossf.file_name as fileName FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
SELECT ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
and pwgdr.contacts_id=#{userId} group by pwgdr.id
</select>
@@ -56,6 +56,26 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
return Result.OK(pageList);
}
//
// /**
// * 第三方在研项目
// *
// * @param
// * @param pageNo
// * @param pageSize
// * @param
// * @return
// */
// @AutoLog(value = "第三方在研项目-分页列表查询")
// @ApiOperation(value="第三方在研项目-分页列表查询", notes="第三方在研项目-分页列表查询")
// @GetMapping(value = "/listForThree")
// public Result<?> listForThree(@RequestParam(name="abbreviation",required = true) String abbreviation,
// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
// ) {
//// IPage<PayResearchProject> pageList = payResearchProjectService.listForThree(pageNo,pageSize,abbreviation);
// return Result.OK(pageList);
// }
/**
* 添加
*