提交 部分手机后端程序

guoyujie

2025-04-15 d3425b2d06136004dbad214e8a5a666ba9aa5da3

提交 部分手机后端程序

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -169,4 +169,10 @@
        return  Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
    }

    @ApiOperation("手机查询本班组报工记录")
    @PostMapping("/selectReportingWorkRecordByPhone")
    public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam)  {
        return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
    }

}

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

@@ -271,7 +271,8 @@
        reportingWorkMapper.insert(reportingWork);
        //副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量
        reportingWorkDetails.forEach(reportingWorkDetail -> {

            reportingWork.setThisCompletedQuantity(reportingWork.getThisCompletedQuantity() + reportingWorkDetail.getCompletedQuantity());
            reportingWork.setThisWornQuantity(reportingWork.getThisWornQuantity() + reportingWorkDetail.getBreakageQuantity());
            int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
            reportingWorkDetail.setReportingWorkId(reportingWorkId);
            List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
@@ -376,6 +377,8 @@


        });
        reportingWorkMapper.update(reportingWork, new LambdaUpdateWrapper<ReportingWork>()
                .eq(ReportingWork::getId, reportingWork.getId()));

        //保存日志
        Log log = new Log();
@@ -664,8 +667,6 @@
            } else {
                return false;
            }


        } else {
            return false;
        }
@@ -1160,4 +1161,32 @@
        result.put("date",date);
        return result;
    }

    public Map<String, Object> selectReportingWorkRecordByPhoneSv(Map<String,Object> reportingWork) {
        List<LocalDateTime> dateList = (List<LocalDateTime>) reportingWork.get("searchDate");
        String startDate = LocalDate.now().minusDays(14).toString();
        String endDate = LocalDate.now().toString();
        if (dateList.get(0)!=null){
            startDate = String.valueOf(dateList.get(0));
        }
        if (dateList.get(1)!=null){
            endDate = String.valueOf(dateList.get(1));
        }
        List<String> date = new ArrayList<>();
        date.add(startDate);
        date.add(endDate);
        Map<String, Object> result = new HashMap<>();
        result.put("data",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")));
        result.put("date",date);

         return result;

    }
}