|
|
@@ -70,7 +70,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
PatentNew pn=patentNewMapper.selectByPrimaryKey(p.getId());
|
|
|
StringBuffer str=new StringBuffer(a.getName());
|
|
|
if (!p.getApplyDate().equals(pn.getApplyDate())
|
|
|
- || p.getType() != pn.getType()) {
|
|
|
+ || !Objects.equals(p.getType(), pn.getType())) {
|
|
|
p.setYears(getyear(p));
|
|
|
p.setPatentAmount(sumAmout(p.getType(),p.getTid(),p.getYears()));
|
|
|
if(p.getPatentAmount()==null) {
|
|
|
@@ -87,7 +87,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
PatentNewLog pl = new PatentNewLog();
|
|
|
pl.setPid(p.getId());
|
|
|
boolean flag=false;
|
|
|
- StringBuffer s=new StringBuffer();
|
|
|
+ StringBuilder s=new StringBuilder();
|
|
|
if (p.getPatentNo()!=null&&!p.getPatentNo().equals(pn.getPatentNo())) {
|
|
|
s.append("[专利号:").append(pn.getPatentNo()).append(" => ").append(p.getPatentNo()).append("],");
|
|
|
flag=true;
|
|
|
@@ -154,7 +154,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
}
|
|
|
if (flag) {
|
|
|
str.append("修改了:").append(s);
|
|
|
- pl.setContent(str.toString().substring(0, str.toString().length()-1));
|
|
|
+ pl.setContent(str.substring(0, str.toString().length()-1));
|
|
|
patentNewLogMapper.insertSelective(pl);
|
|
|
}
|
|
|
}
|
|
|
@@ -166,7 +166,6 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<PatentNewBo> selectPatentNew(PatentNewBo p,Integer pageSize, Integer pageNo) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
@@ -178,12 +177,10 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
List<PatentNewBo> list=(List<PatentNewBo>) pa.getList();
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
for (PatentNewBo pn : list) {
|
|
|
- if (aid.equals(pn.getAid())) {
|
|
|
- pn.setIsFollow(1);
|
|
|
- }else {
|
|
|
- pn.setIsFollow(0);
|
|
|
- }
|
|
|
- }
|
|
|
+ if (aid != null && aid.equals(pn.getAid())) {
|
|
|
+ pn.setIsFollow(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
return pa;
|
|
|
}
|
|
|
|
|
|
@@ -296,8 +293,8 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
throw new BusinessException(new Error("未找到正确的参数。"));
|
|
|
}
|
|
|
List<PatentNew> list=new ArrayList<>();
|
|
|
- List<Notice> nl=new ArrayList<Notice>();
|
|
|
- String str= new String();
|
|
|
+ List<Notice> nl= new ArrayList<>();
|
|
|
+ String str= "";
|
|
|
//循环除了第2行的所有行
|
|
|
for(int rowNum = firstRowNum+2;rowNum <= lastRowNum;rowNum++){
|
|
|
//获得当前行
|
|
|
@@ -392,10 +389,8 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
list2.add(list.get(i));
|
|
|
if (50 == list2.size() || i == list.size() - 1) {
|
|
|
- if (list2.size() > 0) {
|
|
|
- patentNewMapper.insertBatch(list2);
|
|
|
- }
|
|
|
- list2.clear();
|
|
|
+ patentNewMapper.insertBatch(list2);
|
|
|
+ list2.clear();
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -526,7 +521,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
patentYear=patentYearPaymentMapper.selectAll();
|
|
|
}
|
|
|
for (PatentYearPayment p : patentYear) {
|
|
|
- if (type==p.getType()&&year==p.getYear()) {
|
|
|
+ if (Objects.equals(type, p.getType()) && Objects.equals(year, p.getYear())) {
|
|
|
if (tid==null){
|
|
|
return p.getPatentAmount();
|
|
|
}else{
|
|
|
@@ -612,8 +607,6 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
|
|
|
/**
|
|
|
* 批量添加专利日志
|
|
|
- * @param type
|
|
|
- * @param ls
|
|
|
*/
|
|
|
private void addPatentNewLog(Integer type, List<String> ls,String aid) {
|
|
|
List<PatentNewLog> log=new ArrayList<PatentNewLog>();
|
|
|
@@ -683,7 +676,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
for (int i = 0; i < logList.size(); i++) {
|
|
|
logList2.add(logList.get(i));
|
|
|
if (50 == logList2.size() || i == logList.size() - 1) {
|
|
|
- if (logList2.size() > 0) insertLogBatch(logList2);
|
|
|
+ insertLogBatch(logList2);
|
|
|
Thread.sleep(2000);
|
|
|
logList2.clear();
|
|
|
}
|
|
|
@@ -695,11 +688,8 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
@Override
|
|
|
public boolean checkTid(Integer tid) {
|
|
|
TOrderTask task=tOrderTaskMapper.queryById(tid);
|
|
|
- if (task==null) {
|
|
|
- return true;
|
|
|
- }
|
|
|
- return false;
|
|
|
- }
|
|
|
+ return task == null;
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public int countDays(Date endDate) {
|
|
|
@@ -713,8 +703,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
now.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
now.clear(Calendar.MINUTE);
|
|
|
now.clear(Calendar.SECOND);
|
|
|
- int days=(int) ((end.getTimeInMillis() - now.getTimeInMillis()) / (1000 * 3600 * 24));
|
|
|
- return days;
|
|
|
+ return (int) ((end.getTimeInMillis() - now.getTimeInMillis()) / (1000 * 3600 * 24));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -728,9 +717,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
sumYears(p);
|
|
|
PatentNewLog pl = new PatentNewLog();
|
|
|
pl.setPid(p.getId());
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
- str.append(a.getName()).append("修改了有无费减");
|
|
|
- pl.setContent(str.toString());
|
|
|
+ pl.setContent(a.getName() + "修改了有无费减");
|
|
|
patentNewLogMapper.insertSelective(pl);
|
|
|
patentNewMapper.updateByPrimaryKeySelective(pn);
|
|
|
}
|