xml中筛选条件匹配方法修改

chenlu

2025-11-27 b70ea28f51757ed39992d5a71b2e15b1d4cc7c7d

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

@@ -161,6 +161,8 @@
            //工艺流程
            map.put("technologicalProcess", technologicalProcess);

            //获取服务器时间
            map.put("reportingWorkTiem", LocalDateTime.now());
            //设备下拉框
            map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
            //班组下拉框
@@ -187,7 +189,7 @@
                   // if (reviewedState==1){//已审核
                        //不是第一道工序，查询报工数据
                        List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, splitTechNumbers(technologyStr), process,previousProcess,laminating);
                        if(process.equals("中空")){
                        if(laminating.equals("stepD")){
                            //获取该流程卡订单号
                            String orderId = reportingWorkMapper.selectOrderid(processIdStr);
                            details.forEach( detail -> {
@@ -746,6 +748,14 @@
        JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
        ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
        List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);


        ReportingWork reportingWork1 = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
                .eq(ReportingWork::getReportingWorkId, reportingWork.getReportingWorkId()));
        reportingWork.setCreatorId(reportingWork1.getCreatorId());
        reportingWork.setCreator(reportingWork1.getCreator());
        reportingWork.setUpdateTime(LocalDateTime.now());

        //查询该报工是否为报工转移订单
        Integer transferState = reportingWorkMapper.selectReviewedState(reportingWork.getReportingWorkId());
        if (transferState !=3){
@@ -904,7 +914,7 @@

        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("并行查询报工记录异常：" + e.getMessage(), e);
            throw new RuntimeException("报工查询并行查询报工记录异常：" + e.getMessage(), e);
        }

        return result;