| | |
|---|
| | | List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber()); |
|---|
| | | //工序列表 |
|---|
| | | List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList(); |
|---|
| | | itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId())); |
|---|
| | | itemmap.put("processList", processList); |
|---|
| | | itemmap.put("processNameList", processNameList); |
|---|
| | | // itemmap.put("numberList", numberList); |
|---|
| | | list.add(itemmap); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | map.put("data", list); |
|---|
| | | //初始化值 |
|---|
| | | printLike = null; |
|---|
| | |
|---|
| | | } |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> PrintProgressProcessCardSv(List<String> selectDate, List<String> columns) { |
|---|
| | | String endDate = LocalDate.now().toString(); |
|---|
| | | String startDate = LocalDate.now().minusDays(15).toString(); |
|---|
| | | if(selectDate !=null && selectDate.size()==2){ |
|---|
| | | if(!selectDate.get(0).isEmpty()){ |
|---|
| | | startDate = selectDate.get(0); |
|---|
| | | } |
|---|
| | | if(!selectDate.get(1).isEmpty()){ |
|---|
| | | endDate = selectDate.get(1); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | //获取表格内容数据 |
|---|
| | | List<Map<String, String>> dataList = flowCardMapper.PrintProgressProcessCardData(startDate, endDate); |
|---|
| | | //获取表头工序筛选数据 |
|---|
| | | List<Map<String, String>> uniqueList = flowCardMapper.OrderProcess(); |
|---|
| | | map.put("title", uniqueList); |
|---|
| | | List<String> list = new ArrayList<>(); |
|---|
| | | list.add(startDate); |
|---|
| | | list.add(endDate); |
|---|
| | | map.put("selectDate",list); |
|---|
| | | map.put("data",dataList ); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
