|
|
|
@ -1,5 +1,6 @@
|
|
|
|
package com.flossom.system.service.impl;
|
|
|
|
package com.flossom.system.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
@ -109,6 +110,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
|
|
|
|
instrumentLiningQuery.setInstrumentId(id);
|
|
|
|
instrumentLiningQuery.setInstrumentId(id);
|
|
|
|
List<WxInstrumentLining> instrumentLiningList = wxInstrumentLiningMapper.selectWxInstrumentLiningList(instrumentLiningQuery);
|
|
|
|
List<WxInstrumentLining> instrumentLiningList = wxInstrumentLiningMapper.selectWxInstrumentLiningList(instrumentLiningQuery);
|
|
|
|
if (instrumentLiningList != null) {
|
|
|
|
if (instrumentLiningList != null) {
|
|
|
|
|
|
|
|
List<WxLining> liningList = new ArrayList<>();
|
|
|
|
for (WxInstrumentLining wxInstrumentLining : instrumentLiningList) {
|
|
|
|
for (WxInstrumentLining wxInstrumentLining : instrumentLiningList) {
|
|
|
|
Long liningId = wxInstrumentLining.getLiningId();
|
|
|
|
Long liningId = wxInstrumentLining.getLiningId();
|
|
|
|
WxLining wxLining = wxLiningMapper.selectWxLiningById(liningId);
|
|
|
|
WxLining wxLining = wxLiningMapper.selectWxLiningById(liningId);
|
|
|
|
@ -127,8 +129,10 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
|
|
|
|
.map(Long::intValue)
|
|
|
|
.map(Long::intValue)
|
|
|
|
.collect(Collectors.toList())
|
|
|
|
.collect(Collectors.toList())
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
liningList.add(wxLining);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wxInstrumentSaveReq.setWxLiningList(liningList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return wxInstrumentSaveReq;
|
|
|
|
return wxInstrumentSaveReq;
|
|
|
|
|