|
|
@@ -260,6 +260,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
str=str.append(remarks);
|
|
|
p.setAuditInfo(str.toString());
|
|
|
+ p.setRejectName(ad.getName());
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
addpublicLog(id, status, remarks);
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
@@ -301,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());
|
|
|
@@ -312,16 +314,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
str=str.append("拒绝技术协单,").append(remarks);
|
|
|
PublicRelease newMain=new PublicRelease();
|
|
|
newMain.setId(mainPublic.getId());
|
|
|
- newMain.setStatus(0);
|
|
|
+ newMain.setStatus(4);
|
|
|
newMain.setRejectName(ad.getName());
|
|
|
newMain.setAuditInfo(str.toString());
|
|
|
+ addpublicLog(mainPublic.getId(), status, remarks);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(newMain);
|
|
|
PublicRelease up=new PublicRelease();
|
|
|
up.setId(id);
|
|
|
up.setAuditInfo(str.toString());
|
|
|
up.setStatus(3);
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(up);
|
|
|
- return addPublicLogPlus(mainPublic.getId(), mainPublic.getAid(), str.toString(), 0);
|
|
|
+ return addNoticeAndWeChat(mainPublic.getId(), mainPublic.getAid(), str.toString(), status);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -332,8 +336,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param status 0驳回
|
|
|
* @return
|
|
|
*/
|
|
|
- private Integer addPublicLogPlus(Integer id,String aid, String remarks, Integer status) {
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
+ private Integer addNoticeAndWeChat(Integer id,String aid, String remarks, Integer status) {
|
|
|
Integer noticeType=0;
|
|
|
if (status ==0)noticeType=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
|
|
|
sendNoticeAndSoucket(aid,noticeType, remarks);
|
|
|
@@ -512,10 +515,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
TokenManager.hasRole(AFTConstants.CED)|| TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
|
|
|
if(in.getDepId()!=null)map.put("depId", in.getDepId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)){
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
if(in.getClockStart()!=null)map.put("clockStart", in.getClockStart());
|
|
|
if(in.getClockEnd()!=null)map.put("clockEnd", in.getClockEnd()+" 23:59:59");
|
|
|
if(in.getCreateStart()!=null)map.put("createStart", in.getCreateStart());
|