|
|
@@ -653,7 +653,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
- params.put("newStatus", tOrderDunMapper.selectByOrderNo(orderNo).isEmpty()?1:0);
|
|
|
+ if(newStatus==0)params.put("newStatus", 0);
|
|
|
+ else params.put("newStatus", tOrderDunMapper.selectByOrderNo(orderNo).isEmpty()?1:0);
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(specially!=null&&specially==1) params.put("aid", TokenManager.getAdminId());
|
|
|
@@ -940,7 +941,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
case "未收款": o = ob.getUncollectedAmount().toString(); break;
|
|
|
case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
|
|
|
case "催收科目": o = ob.getDunSubject(); break;
|
|
|
- case "催收状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
|
|
|
+ case "催款状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
|
|
|
case "催款启动时间": o = ob.getStartDate(); break;
|
|
|
case "签单时间": o = ob.getSignDate(); break;
|
|
|
default: o = ""; break;
|