|
|
@@ -122,27 +122,28 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- 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(contractId , province,
|
|
|
- unitName, copyrightName, status, createTime, acceptTime, authTime, pageNo, pageSize, null), pageNo,
|
|
|
- pageSize);
|
|
|
+ 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(contractId,
|
|
|
+ province, unitName, copyrightName, status, createTime, acceptTime, authTime, pageNo, pageSize, null),
|
|
|
+ pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- 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(contractId, province,
|
|
|
- unitName, copyrightName, status, createTime, acceptTime, authTime, pageNo, pageSize, uid), pageNo,
|
|
|
- pageSize);
|
|
|
+ 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(contractId, province, unitName, copyrightName, status, createTime, acceptTime, authTime,
|
|
|
+ pageNo, pageSize, uid),
|
|
|
+ pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
- 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) {
|
|
|
+ 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<>();
|
|
|
|
|
|
if (TokenManager.getAdminToken() != null && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
@@ -236,8 +237,9 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
List<CopyrightLog> log = new ArrayList<CopyrightLog>();
|
|
|
List<CopyrightInfo> list = copyrightInfoMapper.selectByPrimaryKeys(Arrays.asList(ids));
|
|
|
if (null != list && list.size() > 0) {
|
|
|
+ CopyrightLog copyrightLog = null;
|
|
|
for (CopyrightInfo copyrightInfo : list) {
|
|
|
- CopyrightLog copyrightLog = new CopyrightLog();
|
|
|
+ copyrightLog = new CopyrightLog();
|
|
|
BeanUtils.copyProperties(cl, copyrightLog);
|
|
|
copyrightLog.setId(UUID.randomUUID().toString());
|
|
|
copyrightLog.setCid(copyrightInfo.getId());
|
|
|
@@ -295,13 +297,14 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
public void batchInsertContractRecord(Contract contract) {
|
|
|
contract.setCopyrightStatus(ContractBusinessStatus.CREATE.getCode());
|
|
|
contractMapper.updateByPrimaryKeySelective(contract);
|
|
|
-
|
|
|
+
|
|
|
List<CopyrightInfo> ci = new ArrayList<>();
|
|
|
List<CopyrightLog> cl = new ArrayList<>();
|
|
|
-
|
|
|
+ CopyrightInfo c = null;
|
|
|
+ CopyrightLog l = null;
|
|
|
for (int i = 0; i < contract.getCopyrightNum(); i++) {
|
|
|
- CopyrightInfo c = new CopyrightInfo();
|
|
|
- CopyrightLog l = new CopyrightLog();
|
|
|
+ c = new CopyrightInfo();
|
|
|
+ l = new CopyrightLog();
|
|
|
c.getId();
|
|
|
c.setUid(contract.getUid());
|
|
|
c.setContact(contract.getContacts());
|
|
|
@@ -313,14 +316,14 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
c.setCreateTime(now.getTime());
|
|
|
c.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
|
-
|
|
|
+
|
|
|
l.getId();
|
|
|
l.setCid(c.getId());
|
|
|
l.setStatus(CopyrightStatus.CREATE.getCode());
|
|
|
l.setOperator(TokenManager.getAdminId());
|
|
|
l.setOperator(TokenManager.getAdminId());
|
|
|
l.setRecordTime(now.getTime());
|
|
|
-
|
|
|
+
|
|
|
ci.add(c);
|
|
|
cl.add(l);
|
|
|
}
|