|
|
@@ -154,7 +154,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeDunMapper.insertSelectiveList(listcd);
|
|
|
}
|
|
|
List<TChangeTask> listck=new ArrayList<>();
|
|
|
- List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo());
|
|
|
+ List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
|
|
|
if (listTask!=null&&!listTask.isEmpty()) {
|
|
|
for (TOrderTaskBo tt : listTask) {
|
|
|
TChangeTask ck=new TChangeTask();
|
|
|
@@ -197,7 +197,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
* 新增审核流程中的
|
|
|
*/
|
|
|
private void insertOrderExamine(String orderNo) {
|
|
|
- List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTaskAll(orderNo);
|
|
|
+ List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTaskAll(orderNo,null);
|
|
|
for (TOrderTaskBo t : list) {
|
|
|
if (t.getConsultantId()!=null) {
|
|
|
OrderExamine o=new OrderExamine();
|
|
|
@@ -421,7 +421,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
private void changeAdopt(NewOrderChangeBo nb) {
|
|
|
TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null);
|
|
|
- List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
|
|
|
+ List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo(),null);
|
|
|
List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
|
|
|
String newOrderNo=idGenerator.generateId().toString();
|
|
|
t1.setOrderNo(newOrderNo);
|