Procházet zdrojové kódy

修改日志排序

Administrator před 4 roky
rodič
revize
b771559e82

+ 10 - 0
src/main/java/com/goafanti/admin/bo/InputPublicRelease.java

@@ -14,6 +14,8 @@ public class InputPublicRelease extends PublicRelease {
 	private String releaseEnds;
 	
 	private String ocbId;
+	
+	private String reason;
 
 	public String getReleaseStarts() {
 		return releaseStarts;
@@ -39,4 +41,12 @@ public class InputPublicRelease extends PublicRelease {
 		this.ocbId = ocbId;
 	}
 
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
 }

+ 6 - 1
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -164,7 +164,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			e.printStackTrace();
 			throw new BusinessException("转换异常");
 		}
-		if(in.getStatus()!=3)in.setStatus(1);
+		if(in.getStatus()==null||in.getStatus()!=3) {
+			in.setStatus(1);
+		}else {
+			PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),4,in.getReason(),new Date());
+			publicReleaseLogMapper.insertSelective(log);
+		}
 		publicReleaseMapper.updateByPrimaryKeySelective(in);
 		return 1;
 	}

+ 1 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml

@@ -197,6 +197,7 @@
 	<if test="ufid !=null">
 	and pr.ufid  = #{ufid}
 	</if>
+	order by a.create_time desc
   </select>
 
 </mapper>