@@ -148,5 +148,6 @@
select a.id,a.tid,a.aid,a.remarks,a.status,b.name aname,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes
from projcet_check_log a left join admin b on a.aid=b.id
where a.tid= #{tid}
+ order by a.create_time
</select>
</mapper>
@@ -274,15 +274,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
log.setTid(t.getId());
log.setAid(TokenManager.getAdminId());
StringBuffer str=new StringBuffer();
- if (t.getOfficialCost()==null&&t.getCostReduction()==null) {
+ if (t.getOfficialCost()==null&&t.getCostReduction()==null&&t.getPatentType()==null) {
str.append("未做修改");
}else {
str.append("修改了:");
+ if (t.getPatentType()!=null&&use.getPatentType()!=t.getPatentType()) {
+ str.append("官费类型");
+ }
if (t.getOfficialCost()!=null&&use.getOfficialCost()!=t.getOfficialCost()) {
- str.append("官费");
+ str.append(",").append("有无官费");
}
if (t.getCostReduction()!=null&&use.getCostReduction()!=t.getCostReduction()) {
- str.append(",").append("费减");
+ str.append(",").append("有无费减");
str.append("。");
@@ -523,7 +523,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
PaymentNode n=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
total=n.getTotalAmount();
- if (a.compareTo(total) != 1) {
+ if (a.compareTo(total) == 1) {
return -1;
return 0;