ERP_override.git

			@@ -1,21 +1,18 @@

			package com.example.erp.service.pp;

			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.dynamic.datasource.annotation.DS;

			import com.example.erp.entity.pp.DamageDetails;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.pp.Report;
			import com.example.erp.mapper.pp.ProductionSchedulingMapper;
			import com.example.erp.mapper.pp.ReportMapper;
			import com.example.erp.mapper.sd.OrderProcessDetailMapper;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.sql.Date;
			import java.time.LocalDate;
			import java.util.*;
			import java.util.stream.Collectors;

			@Service
			@DS("pp")
			@@ -23,12 +20,13 @@
			private final ReportMapper reportMapper;

			private final OrderProcessDetailMapper orderProcessDetailMapper;
			private final ProductionSchedulingMapper productionSchedulingMapper;



			public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper) {
			public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper,ProductionSchedulingMapper productionSchedulingMapper) {
			this.reportMapper = reportMapper;
			this.orderProcessDetailMapper = orderProcessDetailMapper;
			this.productionSchedulingMapper = productionSchedulingMapper;
			}

			//流程卡进度方法
			@@ -125,4 +123,31 @@
			// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
			return map;
			}

			public Map<String,Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {

			if ("null".equals(orderId)) {
			orderId = "";
			}
			if ("null".equals(inputProject)) {
			inputProject = "";
			}
			Map<String,Object> map = new HashMap<>();
			map.put("data",reportMapper.workInProgressMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
			map.put("process", productionSchedulingMapper.selectProcess());
			return map;
			}

			public Map<String,Object> selectProcessToBeCompletedSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
			if ("null".equals(orderId)) {
			orderId = "";
			}
			if ("null".equals(inputProject)) {
			inputProject = "";
			}
			Map<String,Object> map = new HashMap<>();
			map.put("data",reportMapper.processToBeCompletedMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
			map.put("process", productionSchedulingMapper.selectProcess());
			return map;
			}
			}