ERP_override.git

			@@ -3,10 +3,7 @@

			import com.baomidou.dynamic.datasource.annotation.DS;

			import com.example.erp.dto.pp.DamageReportDTO;
			import com.example.erp.dto.pp.ScheduleProductionScheduleDTO;
			import com.example.erp.dto.pp.TeamOutputDTO;
			import com.example.erp.dto.pp.WorkInProgressDTO;
			import com.example.erp.dto.pp.*;
			import com.example.erp.entity.pp.DamageDetails;
			import com.example.erp.entity.pp.Report;
			import com.example.erp.mapper.pp.ProductionSchedulingMapper;
			@@ -103,7 +100,7 @@
			return map;
			}

			public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, DamageDetails damageDetails) {
			public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, CrossProcessBreakingDTO crossProcessBreakingDTO) {
			Integer offset = (pageNum - 1) * pageSize;
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(15).toString();
			@@ -116,13 +113,12 @@
			}
			}
			Map<String, Object> map = new HashMap<>();
			map.put("data", reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
			map.put("total", reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, damageDetails));
			map.put("data", reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, crossProcessBreakingDTO));
			map.put("total", reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, crossProcessBreakingDTO));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate", list);
			// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
			return map;
			}

			@@ -151,7 +147,7 @@
			} else if (optionVal.equals("3")) {

			} else {

			//没有选择分组
			map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
			map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));

			@@ -355,7 +351,6 @@
			}

			public List exportDamageReportSv(List<LocalDate> dates) {

			return reportMapper.exportDamageReportMp(dates);
			}

			@@ -378,7 +373,6 @@
			}

			public List exportWorkInProgressSv(Map<String, Object> dates) {
			List<LocalDate> date= (List<LocalDate>) dates.get("date");
			String process= (String) dates.get("processes");
			String inputVal= (String) dates.get("inputVal");
			String project= (String) dates.get("project");
			@@ -388,7 +382,7 @@
			if ("null".equals(project)) {
			project = "";
			}
			return reportMapper.exportWorkInProgressMp(date,process,inputVal,project);
			return reportMapper.exportWorkInProgressMp(process,inputVal,project);
			}

			public List exportTaskCompletionStatusSv(Map<String, Object> dates) {
			@@ -410,6 +404,9 @@
			}

			public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
			if (selectProcesses.equals("全部")){
			selectProcesses="";
			}
			Integer offset = (pageNum - 1) * pageSize;
			Map<String, Object> map = new HashMap<>();
			map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
			@@ -432,4 +429,13 @@
			String process= (String) dates.get("processes");
			return reportMapper.exportScheduleReportMp(date,process);
			}

			public List exportTeamOutputSv(Map<String, Object> dates) {
			List<LocalDate> date= (List<LocalDate>) dates.get("date");
			String process= (String) dates.get("processes");
			if (process.equals("全部")){
			process="";
			}
			return reportMapper.exportTeamOutputMp(date,process);
			}
			}