Browse Source

公出修改、撤销BUG修复

anderx 3 years ago
parent
commit
efe6ec4301

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

@@ -184,7 +184,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			in.setUpdateStatus(1);
 			if(in.getAssist()==1){
 				in.setAssistAidName(getAssistAidName(in.getAssistAid()));
-				publicReleaseMapper.updateStatusByMainId(1,in.getId());
 			}
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			addPublicReleaseLog(my,in,PublicReleaseLog.states.xg.getCode(),u.getNickname(),date);
@@ -197,8 +196,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				publicReleaseLogMapper.insertSelective(log2);
 			}
 
-			publicReleaseMapper.updateStatusByMainId(3,in.getId());
 		}
+			publicReleaseMapper.updateStatusByMainId(in.getStatus(),in.getId());
 
 		publicReleaseLogMapper.insertSelective(log);
 		return publicReleaseMapper.updateByPrimaryKeySelective(in);
@@ -302,9 +301,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}else {
 					use.setId(out.getId());
 					use.setAid(out.getAid());
+					use.setAssist(2);
 					use.setStatus(2);
-					use.setClockIn(0);
-					use.setClockInTime(null);
 					publicReleaseMapper.updateByPrimaryKey(use);
 				}
 			}