Преглед изворни кода

修改新增分类与项目编号

anderx пре 4 година
родитељ
комит
d380dd3f1f

+ 6 - 10
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -81,17 +81,13 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		PatentNewLog pl = new PatentNewLog();
 		pl.setPid(p.getId());
 		Admin a = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		PatentNew pn=patentNewMapper.selectByPrimaryKey(p.getId());
 		pl.setContent(a.getName() + "修改了专利内容。");
-		if (p.getApplyDates()!=null||p.getType()!=null||p.getTid()!=null) {
-			PatentNew pn=patentNewMapper.selectByPrimaryKey(p.getId());
-			
-			if (p.getApplyDate().getTime()!=pn.getApplyDate().getTime()||
-					p.getType()!=pn.getType()||p.getTid()!=pn.getTid()) {
-				p.setYears(getyear(p));
-				p.setType(pn.getType());
-				p.setTid(pn.getTid());
-				sumYears(p);
-			}
+		if (!p.getApplyDate().equals(pn.getApplyDate()) 
+				|| p.getType() != pn.getType()
+				|| !p.getTid().equals( pn.getTid())) {
+			p.setYears(getyear(p));
+			sumYears(p);
 		}
 		patentNewLogMapper.insertSelective(pl);
 		return patentNewMapper.updateByPrimaryKeySelective(p);