|
|
@@ -122,25 +122,25 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<CopyrightInfo> listCopyrightInfo(String province, String unitName, String copyrightName,
|
|
|
+ public Pagination<CopyrightInfo> listCopyrightInfo(String contractId, String province, String unitName, String copyrightName,
|
|
|
CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
- return (Pagination<CopyrightInfo>) findPage("findListByPage", "findListCount", buildListParams(province,
|
|
|
+ return (Pagination<CopyrightInfo>) findPage("findListByPage", "findListCount", buildListParams(contractId , province,
|
|
|
unitName, copyrightName, status, createTime, acceptTime, authTime, pageNo, pageSize, null), pageNo,
|
|
|
pageSize);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String province, String unitName, String copyrightName,
|
|
|
+ public Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String contractId, String province, String unitName, String copyrightName,
|
|
|
CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
|
|
|
Integer pageSize, String uid) {
|
|
|
- return (Pagination<CopyrightInfoSummary>) findPage("findListByPage", "findListCount", buildListParams(province,
|
|
|
+ return (Pagination<CopyrightInfoSummary>) findPage("findListByPage", "findListCount", buildListParams(contractId, province,
|
|
|
unitName, copyrightName, status, createTime, acceptTime, authTime, pageNo, pageSize, uid), pageNo,
|
|
|
pageSize);
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> buildListParams(String province, String unitName, String copyrightName,
|
|
|
+ private Map<String, Object> buildListParams(String contractId, String province, String unitName, String copyrightName,
|
|
|
CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
|
|
|
Integer pageSize, String uid) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
@@ -151,6 +151,9 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
if (StringUtils.isNotBlank(province)) {
|
|
|
params.put("province", province);
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(contractId)) {
|
|
|
+ params.put("contractId", contractId);
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(unitName)) {
|
|
|
params.put("unitName", unitName);
|
|
|
}
|