提交app记录显示修改

guoyujie

2025-07-30 b691a8f51b4d0eb6fe0901160b03e8be2f2f463b

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -1204,14 +1204,20 @@
        date.add(startDate);
        date.add(endDate);
        Map<String, Object> result = new HashMap<>();
        result.put("data",reportingWorkMapper.selectList(
        List<ReportingWork> reportingWorkList = reportingWorkMapper.selectList(
                new QueryWrapper<ReportingWork>().nested(
                                reportingWork.get("process")!=null,
                                wrapper-> wrapper.eq("creator_id",reportingWork.get("userId"))//当工序为空时，查询所有报工信息
                        )
                        .gt("reviewed_state",-1)
                        .between("date(reporting_work_time)",startDate,endDate)
                        .orderByDesc("id")));
                        .orderByDesc("id"));
        reportingWorkList.forEach(reportingWork1 -> {
            String Plies =  reportingWorkDetailMapper.getGlassPliesCount(reportingWork1.getReportingWorkId());
            reportingWork1.setProcessId(reportingWork1.getProcessId()+'/'+Plies);
        });

        result.put("data",reportingWorkList);
        result.put("date",date);

         return result;