| | |
|---|
| | | public Map<String, Object> selectNoCardSv(String orderId, String productionId, FlowCard flowCard) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | map.put("data", flowCardMapper.selectNoCardMp(orderId, productionId, flowCard)); |
|---|
| | | map.put("orderOtherMoney", flowCardMapper.selectorderOtherMoney()); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | public Map<String, Object> getSelectPrintingSv(Map<String, Object> object) { |
|---|
| | | public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge) { |
|---|
| | | if (printMerge == null){ |
|---|
| | | printMerge= ""; |
|---|
| | | } |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果 |
|---|
| | | List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class); |
|---|
| | |
|---|
| | | for (FlowCard flowCard : flowCardList) { |
|---|
| | | Map<String, Object> itemmap = new HashMap<>(); |
|---|
| | | //流程卡表头表尾数据 |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber())); |
|---|
| | | //是否传入合并层数 |
|---|
| | | if (printMerge.equals("")||printMerge.equals("null") ){ |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()))); |
|---|
| | | } |
|---|
| | | else{ |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge)); |
|---|
| | | } |
|---|
| | | //流程卡明细数据 |
|---|
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber()); |
|---|
| | | //工艺流程 |
|---|
