|
|
@@ -277,6 +277,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public int updateOrderTask(TOrderTask t) {
|
|
|
TOrderTask use=tOrderTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
+ boolean flag=false;
|
|
|
if(use.getCheckStatus()==1) {
|
|
|
t.setCheckStatus(2);
|
|
|
ProjcetCheckLog log=new ProjcetCheckLog();
|
|
|
@@ -287,25 +288,19 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
(t.getOfficialCost()==use.getOfficialCost()&&t.getPatentType()==use.getPatentType()&&t.getCostReduction()==use.getCostReduction())) {
|
|
|
str.append("未做任何修改。");
|
|
|
}else {
|
|
|
- boolean flag=false;
|
|
|
str.append("修改了:");
|
|
|
if (t.getPatentType()!=null&&use.getPatentType()!=t.getPatentType()) {
|
|
|
str.append("官费类型");
|
|
|
}
|
|
|
if (t.getOfficialCost()!=null&&use.getOfficialCost()!=t.getOfficialCost()) {
|
|
|
str.append(",").append("有无官费");
|
|
|
- if (t.getOfficialCost()==0) {
|
|
|
flag=true;
|
|
|
- }
|
|
|
}
|
|
|
if (t.getCostReduction()!=null&&use.getCostReduction()!=t.getCostReduction()) {
|
|
|
str.append(",").append("有无费减");
|
|
|
flag=true;
|
|
|
}
|
|
|
str.append("。");
|
|
|
- if (flag) {
|
|
|
- patentNewService.updateCostReduction(t.getId());
|
|
|
- }
|
|
|
}
|
|
|
log.setRemarks(str.toString());
|
|
|
log.setStatus(1);
|
|
|
@@ -322,7 +317,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
projcetCheckLogMapper.insertSelective(log);
|
|
|
}
|
|
|
- return tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
+ int i=tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
+ if (flag) {
|
|
|
+ patentNewService.updateCostReduction(t.getId());
|
|
|
+ }
|
|
|
+ return i;
|
|
|
}
|
|
|
|
|
|
|