Просмотр исходного кода

公出列表修改4=技术驳回

anderx лет назад: 3
Родитель
Сommit
c9e6b5870c

+ 2 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -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());
@@ -312,7 +313,7 @@ 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());
 		publicReleaseMapper.updateByPrimaryKeySelective(newMain);
@@ -512,10 +513,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());