|
|
@@ -4863,10 +4863,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, companyId));
|
|
|
List<Map<String,Object>> reportList=reportMapper.getReportList(startDate,endDate,planId,stateKey,departmentId,companyId);
|
|
|
List<List<String>> dataList=new ArrayList<>();
|
|
|
-// String[] title={"员工","工号","所属部门","排除工单号/任务变更通知号","钢印号","工作时长","产品名称","工序名称","进度","质检类型","质检人","工作日期","填报日期"};
|
|
|
-// String[] title={"所属部门","工号","员工","排除工单号/任务变更通知号","钢印号","产品名称","工序名称","进度","工作件数", "工作时长","单价","工价","汇总",
|
|
|
+// String[] title={"员工","工号","所属部门","排产工单号/任务变更通知号","钢印号","工作时长","产品名称","工序名称","进度","质检类型","质检人","工作日期","填报日期"};
|
|
|
+// String[] title={"所属部门","工号","员工","排产工单号/任务变更通知号","钢印号","产品名称","工序名称","进度","工作件数", "工作时长","单价","工价","汇总",
|
|
|
// "工作日期","填报日期","质检类型","质检人"};
|
|
|
- String[] title={"工位名称","项目名称","包名称","生产订单号","工序名称","零件编码","零件名称","零件图号","生产数量", "工时","单价","合计",
|
|
|
+ String[] title={"工位名称","项目名称","排产工单号","生产订单号","工序名称","零件编码","零件名称","零件图号","生产数量", "工时","单价","合计",
|
|
|
"作业人员","日期"};
|
|
|
List<String> titleList=Arrays.asList(title);
|
|
|
dataList.add(titleList);
|
|
|
@@ -4881,7 +4881,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
String curJobBNum = String.valueOf(map.get("jobNumber"));
|
|
|
// item.add(curJobBNum);
|
|
|
// item.add(String.valueOf(map.get("userName")));
|
|
|
-// Integer planType = Integer.valueOf(String.valueOf(map.get("planType")));
|
|
|
+ Integer planType = Integer.valueOf(String.valueOf(map.get("planType")));
|
|
|
// if(planType==0){
|
|
|
// item.add(map.get("productSchedulingNum")==null?"":String.valueOf(map.get("productSchedulingNum")));
|
|
|
// }else {
|
|
|
@@ -4890,7 +4890,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
// item.add(map.get("steelNumArray")==null?"":String.valueOf(map.get("steelNumArray")));
|
|
|
item.add(map.get("projectName")==null?"":String.valueOf(map.get("projectName")));
|
|
|
// item.add(String.valueOf(map.get("productName")));
|
|
|
- item.add("");
|
|
|
+ if(planType==0){
|
|
|
+ item.add(map.get("productSchedulingNum")==null?"":String.valueOf(map.get("productSchedulingNum")));
|
|
|
+ }else {
|
|
|
+ item.add(map.get("taskChangeNoticeNum")==null?"":String.valueOf(map.get("taskChangeNoticeNum")));
|
|
|
+ }
|
|
|
item.add(map.get("productOrderNum")==null?"":String.valueOf(map.get("productOrderNum")));
|
|
|
item.add(String.valueOf(map.get("procedureName")));
|
|
|
item.add("");
|
Min