|
|
@@ -302,6 +302,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public int pushTechReject(Integer id, String remarks) {
|
|
|
+ Integer status=0;
|
|
|
PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
PublicRelease mainPublic= publicReleaseMapper.selectByPrimaryKey(use.getMainId());
|
|
|
Admin ad=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
@@ -316,14 +317,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newMain.setStatus(4);
|
|
|
newMain.setRejectName(ad.getName());
|
|
|
newMain.setAuditInfo(str.toString());
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(newMain);
|
|
|
PublicRelease up=new PublicRelease();
|
|
|
up.setId(id);
|
|
|
up.setAuditInfo(str.toString());
|
|
|
up.setStatus(3);
|
|
|
- addpublicLog(id, 0, remarks);
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(up);
|
|
|
- return addPublicLogPlus(mainPublic.getId(), mainPublic.getAid(), str.toString(), 0);
|
|
|
+ return addPublicLogPlus(mainPublic.getId(), mainPublic.getAid(), str.toString(), status);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -335,7 +337,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @return
|
|
|
*/
|
|
|
private Integer addPublicLogPlus(Integer id,String aid, String remarks, Integer status) {
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
Integer noticeType=0;
|
|
|
if (status ==0)noticeType=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
|
|
|
sendNoticeAndSoucket(aid,noticeType, remarks);
|