|
|
@@ -572,6 +572,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
if (o.getDunType()==1) {
|
|
|
o.setStatus(1);
|
|
|
+ o.setStartTime(new Date());
|
|
|
newOrderDunMapper.updateByPrimaryKeySelective(o);
|
|
|
addNewDunNoticAndSendEmail(t2,o);
|
|
|
}
|
|
|
@@ -652,7 +653,7 @@ 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", newStatus!=null?newStatus:0);
|
|
|
+ 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());
|
|
|
@@ -912,7 +913,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<TOrderNewBo> list=(List<TOrderNewBo>) dunOrderNewList( name, orderNo, starTime, endTime,
|
|
|
specially, adminName, depId,newStatus, pageNo, pageSize).getList();
|
|
|
- String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款启动时间","签单时间"};
|
|
|
+ String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
|
|
|
String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
//type 0 变更
|
|
|
XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"催款信息");
|
|
|
@@ -939,6 +940,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.getStartDate(); break;
|
|
|
case "签单时间": o = ob.getSignDate(); break;
|
|
|
default: o = ""; break;
|