| | |
|---|
| | | |
|---|
| | | public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) { |
|---|
| | | List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs); |
|---|
| | | if (null != list && list.size() > 0) { |
|---|
| | | if (null != list && !list.isEmpty()) { |
|---|
| | | list.sort(new Comparator<CsProVo>() { |
|---|
| | | @Override |
|---|
| | | public int compare(CsProVo o1, CsProVo o2) { |
|---|
| | |
|---|
| | | List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber); |
|---|
| | | |
|---|
| | | |
|---|
| | | if (null != remarkList && remarkList.size() > 0) { |
|---|
| | | if (null != remarkList && !remarkList.isEmpty()) { |
|---|
| | | for (TjOrderRemark remark : remarkList) { |
|---|
| | | Map<String, Object> parent = new HashMap<>(); |
|---|
| | | parent.put("checkAdvice", one.getCheckAdvice()); |
|---|
| | | parent.put("parent", remark.getProName()); |
|---|
| | | parent.put("parentId", remark.getProId().toString()); |
|---|
| | | List<TjOrderDetail> dels = new ArrayList<>(); |
|---|
| | | if (null != tjOrderDetails && tjOrderDetails.size() > 0) { |
|---|
| | | if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) { |
|---|
| | | for (TjOrderDetail tjOrderDetail : tjOrderDetails) { |
|---|
| | | if (remark.getProId().equals(tjOrderDetail.getProId())) { |
|---|
| | | String ckfw = tjOrderDetail.getStanId(); |
|---|
