整合确认、驳回

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -258,6 +258,9 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrMaterialController materialController;
 
+    @Autowired
+    private TPssrMaterialRawController materialRawController;
+
     @Autowired
     private TPssrPumpCleaningController pumpCleaningController;
 
@@ -540,18 +543,109 @@ public class TPssrApproveController extends BaseController {
                 torchvoc.setTaskType(dto.getTaskType());
                 return torchvocController.confirmTorchvoc(torchvoc);
             case "yfl"://原辅料
+                switch (dto.getSubName()) {
+                    case "material":
+                        TPssrMaterial material = new TPssrMaterial();
+                        material.setSubId(dto.getSubId());
+                        material.setIds(dto.getIds());
+                        material.setTaskType(dto.getTaskType());
+                        return materialController.confirmMaterial(material);
+                    case "raw":
+                        TPssrMaterialRaw raw = new TPssrMaterialRaw();
+                        raw.setSubId(dto.getSubId());
+                        raw.setIds(dto.getIds());
+                        raw.setTaskType(dto.getTaskType());
+                        return materialRawController.confirmMaterialRaw(raw);
+                }
             case "jb"://机泵
+                switch (dto.getSubName()) {
+                    case "cleaning":
+                        TPssrPumpCleaning pumpCleaning = new TPssrPumpCleaning();
+                        pumpCleaning.setSubId(dto.getSubId());
+                        pumpCleaning.setIds(dto.getIds());
+                        pumpCleaning.setTaskType(dto.getTaskType());
+                        return pumpCleaningController.confirmPumpCleaning(pumpCleaning);
+                    case "fill":
+                        TPssrPumpFill pumpFill = new TPssrPumpFill();
+                        pumpFill.setSubId(dto.getSubId());
+                        pumpFill.setIds(dto.getIds());
+                        pumpFill.setTaskType(dto.getTaskType());
+                        return pumpFillController.confirmPumpFill(pumpFill);
+                    case "overhaul":
+                        TPssrPumpOverhaul pumpOverhaul = new TPssrPumpOverhaul();
+                        pumpOverhaul.setSubId(dto.getSubId());
+                        pumpOverhaul.setIds(dto.getIds());
+                        pumpOverhaul.setTaskType(dto.getTaskType());
+                        return pumpOverhaulController.confirmPumpOverhaul(pumpOverhaul);
+                }
+                return AjaxResult.error("确认失败！");
             case "zdj"://支吊架
+                TPssrFrame frame = new TPssrFrame();
+                frame.setSubId(dto.getSubId());
+                frame.setIds(dto.getIds());
+                frame.setTaskType(dto.getTaskType());
+                return frameController.confirmFrame(frame);
             case "tzsb"://特种设备
+                switch (dto.getSubName()) {
+                    case "pipe":
+                        TPssrPipe pipe = new TPssrPipe();
+                        pipe.setSubId(dto.getSubId());
+                        pipe.setIds(dto.getIds());
+                        pipe.setTaskType(dto.getTaskType());
+                        return pipeController.confirmPipe(pipe);
+                    case "vessel":
+                        TPssrVessel vessel = new TPssrVessel();
+                        vessel.setSubId(dto.getSubId());
+                        vessel.setIds(dto.getIds());
+                        vessel.setTaskType(dto.getTaskType());
+                        return vesselController.confirmVessel(vessel);
+                }
             case "ybjy"://仪表校验
+                TPssrInstrumentCalibration calibration = new TPssrInstrumentCalibration();
+                calibration.setSubId(dto.getSubId());
+                calibration.setIds(dto.getIds());
+                calibration.setTaskType(dto.getTaskType());
+                return instrumentCalibrationController.confirmInstrumentCalibration(calibration);
             case "yblscs"://仪表联锁测试
+                return AjaxResult.success();
             case "bjlszqr"://报警联锁值确认
+                return AjaxResult.success();
             case "lsdy"://临时电源
+                TPssrPower power = new TPssrPower();
+                power.setSubId(dto.getSubId());
+                power.setIds(dto.getIds());
+                power.setTaskType(dto.getTaskType());
+                return powerController.confirmPower(power);
             case "djsb"://电机设备
+                TPssrMotor motor = new TPssrMotor();
+                motor.setSubId(dto.getSubId());
+                motor.setIds(dto.getIds());
+                motor.setTaskType(dto.getTaskType());
+                return motorController.confirmMotor(motor);
             case "zmdbr"://照明、电伴热
+                TPssrLighting lighting = new TPssrLighting();
+                lighting.setSubId(dto.getSubId());
+                lighting.setIds(dto.getIds());
+                lighting.setTaskType(dto.getTaskType());
+                return lightingController.Lighting(lighting);
             case "jdjdkj"://静电接地、跨接
+                TPssrFranklinism franklinism = new TPssrFranklinism();
+                franklinism.setSubId(dto.getSubId());
+                franklinism.setIds(dto.getIds());
+                franklinism.setTaskType(dto.getTaskType());
+                return franklinismController.Franklinism(franklinism);
             case "qtjcy"://气体检测仪
+                TPssrGasdetector gasdetector = new TPssrGasdetector();
+                gasdetector.setSubId(dto.getSubId());
+                gasdetector.setIds(dto.getIds());
+                gasdetector.setTaskType(dto.getTaskType());
+                return gasdetectorController.Gasdetector(gasdetector);
             case "zxfxy"://在线分析仪
+                TPssrAnalyzer analyzer = new TPssrAnalyzer();
+                analyzer.setSubId(dto.getSubId());
+                analyzer.setIds(dto.getIds());
+                analyzer.setTaskType(dto.getTaskType());
+                return analyzerController.Analyzer(analyzer);
             default:
                 return AjaxResult.error("确认失败！");
         }
@@ -559,7 +653,425 @@ public class TPssrApproveController extends BaseController {
 
     @PutMapping("/handleTurndown")
     public AjaxResult handleTurndown(@RequestBody TPssrApproveDto dto) {
-        return AjaxResult.success();
+        TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(dto.getSubId());
+        switch (tPssrSubcontent.getForShort()) {
+            case "jxxm"://检修项目
+                switch (dto.getSubName()) {
+                    case "exchanger":
+                        List<TPssrOverhaulExchanger> exchangers = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();
+                            exchanger.setSubId(dto.getSubId());
+                            exchanger.setId(item.getId());
+                            exchanger.setReason(item.getReason());
+                            exchangers.add(exchanger);
+                        }
+                        return exchangerController.turnDownExchanger(exchangers);
+                    case "filter":
+                        List<TPssrOverhaulFilter> filters = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrOverhaulFilter filter = new TPssrOverhaulFilter();
+                            filter.setSubId(dto.getSubId());
+                            filter.setId(item.getId());
+                            filter.setReason(item.getReason());
+                            filters.add(filter);
+                        }
+                        return filterController.turnDownFilter(filters);
+                    case "":
+                        List<TPssrOverhaulTower> towers = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrOverhaulTower tower = new TPssrOverhaulTower();
+                            tower.setSubId(dto.getSubId());
+                            tower.setId(item.getId());
+                            tower.setReason(item.getReason());
+                            towers.add(tower);
+                        }
+                        return towerController.turnDownTower(towers);
+                    case "valve":
+                        List<TPssrOverhaulValve> valves = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrOverhaulValve valve = new TPssrOverhaulValve();
+                            valve.setSubId(dto.getSubId());
+                            valve.setId(item.getId());
+                            valve.setReason(item.getReason());
+                            valves.add(valve);
+                        }
+                        return valveController.turnDownValve(valves);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "kgfa"://开工方案
+                List<TPssrProgramme> programmes = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrProgramme programme = new TPssrProgramme();
+                    programme.setSubId(dto.getSubId());
+                    programme.setId(item.getId());
+                    programme.setReason(item.getReason());
+                    programmes.add(programme);
+                }
+                return programmeController.turnDownProgramme(programmes);
+            case "sjbg"://设计变更
+                List<TPssrMoc> mocs = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrMoc moc = new TPssrMoc();
+                    moc.setSubId(dto.getSubId());
+                    moc.setId(item.getId());
+                    moc.setReason(item.getReason());
+                    mocs.add(moc);
+                }
+                return mocController.turnDownMoc(mocs);
+            case "mb"://盲板
+                List<TPssrBlind> blinds = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrBlind blind = new TPssrBlind();
+                    blind.setSubId(dto.getSubId());
+                    blind.setId(item.getId());
+                    blind.setReason(item.getReason());
+                    blinds.add(blind);
+                }
+                return blindController.turnDownBlind(blinds);
+            case "xcws"://现场卫生
+                List<TPssrHygiene> hygeins = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrHygiene hygien = new TPssrHygiene();
+                    hygien.setSubId(dto.getSubId());
+                    hygien.setId(item.getId());
+                    hygien.setReason(item.getReason());
+                    hygeins.add(hygien);
+                }
+                return hygieneController.turnDownHygiene(hygeins);
+            case "rsfh"://人身防护
+                switch (dto.getSubName()) {
+                    case "protection":
+                        List<TPssrProtection> protections = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrProtection protection = new TPssrProtection();
+                            protection.setSubId(dto.getSubId());
+                            protection.setId(item.getId());
+                            protection.setReason(item.getReason());
+                            protections.add(protection);
+                        }
+                        return protectionController.turnDownProtection(protections);
+                    case "measure":
+                        List<TPssrMeasure> measures = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrMeasure measure = new TPssrMeasure();
+                            measure.setSubId(dto.getSubId());
+                            measure.setId(item.getId());
+                            measure.setReason(item.getReason());
+                            measures.add(measure);
+                        }
+                        return measureController.turnDownMeasure(measures);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "sbqjd"://设备清洁度
+                List<TPssrCleaning> cleans = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrCleaning clean = new TPssrCleaning();
+                    clean.setSubId(dto.getSubId());
+                    clean.setId(item.getId());
+                    clean.setReason(item.getReason());
+                    cleans.add(clean);
+                }
+                return cleaningController.turnDownCleaning(cleans);
+            case "qm"://气密
+                List<TPssrAirtight> airtights = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrAirtight airtight = new TPssrAirtight();
+                    airtight.setSubId(dto.getSubId());
+                    airtight.setId(item.getId());
+                    airtight.setReason(item.getReason());
+                    airtights.add(airtight);
+                }
+                return airtightController.turnDownAirtight(airtights);
+            case "sksgfmzt"://锁开锁关阀门状态
+                List<TPssrLock> locks = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrLock lock = new TPssrLock();
+                    lock.setSubId(dto.getSubId());
+                    lock.setId(item.getId());
+                    lock.setReason(item.getReason());
+                    locks.add(lock);
+                }
+                return lockController.turnDownLock(locks);
+            case "sys"://实验室
+                List<TPssrLaboratory> laboratories = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrLaboratory laboratory = new TPssrLaboratory();
+                    laboratory.setSubId(dto.getSubId());
+                    laboratory.setId(item.getId());
+                    laboratory.setReason(item.getReason());
+                    laboratories.add(laboratory);
+                }
+                return laboratoryController.turnDownLaboratory(laboratories);
+            case "dj"://短接
+                List<TPssrCircuit> circuits = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrCircuit circuit = new TPssrCircuit();
+                    circuit.setSubId(dto.getSubId());
+                    circuit.setId(item.getId());
+                    circuit.setReason(item.getReason());
+                    circuits.add(circuit);
+                }
+                return circuitController.turnDownCircuit(circuits);
+            case "dqzh"://氮气置换
+                List<TPssrNitrogen> nitrogens = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrNitrogen nitrogen = new TPssrNitrogen();
+                    nitrogen.setSubId(dto.getSubId());
+                    nitrogen.setId(item.getId());
+                    nitrogen.setReason(item.getReason());
+                    nitrogens.add(nitrogen);
+                }
+                return nitrogenController.turnDownNitrogen(nitrogens);
+            case "xqf"://消气防设施
+                return AjaxResult.success();
+            case "aqss"://安全设施
+                switch (dto.getSubName()) {
+                    case "bleed":
+                        List<TPssrSafetyBleed> bleeds = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrSafetyBleed bleed = new TPssrSafetyBleed();
+                            bleed.setSubId(dto.getSubId());
+                            bleed.setId(item.getId());
+                            bleed.setReason(item.getReason());
+                            bleeds.add(bleed);
+                        }
+                        return safetyController.turnDownBleed(bleeds);
+                    case "breath":
+                        List<TPssrSafetyBreath> breaths = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrSafetyBreath breath = new TPssrSafetyBreath();
+                            breath.setSubId(dto.getSubId());
+                            breath.setId(item.getId());
+                            breath.setReason(item.getReason());
+                            breaths.add(breath);
+                        }
+                        return safetyController.turnDownBreath(breaths);
+                    case "brust":
+                        List<TPssrSafetyBrust> brusts = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrSafetyBrust brust = new TPssrSafetyBrust();
+                            brust.setSubId(dto.getSubId());
+                            brust.setId(item.getId());
+                            brust.setReason(item.getReason());
+                            brusts.add(brust);
+                        }
+                        return safetyController.turnDownBrust(brusts);
+                    case "flamearrester":
+                        List<TPssrSafetyFlamearrester> flamearresters = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrSafetyFlamearrester flamearrester = new TPssrSafetyFlamearrester();
+                            flamearrester.setSubId(dto.getSubId());
+                            flamearrester.setId(item.getId());
+                            flamearrester.setReason(item.getReason());
+                            flamearresters.add(flamearrester);
+                        }
+                        return safetyController.turnDownFlamearrester(flamearresters);
+                    case "valve":
+                        List<TPssrSafetyValve> valves = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrSafetyValve valve = new TPssrSafetyValve();
+                            valve.setSubId(dto.getSubId());
+                            valve.setId(item.getId());
+                            valve.setReason(item.getReason());
+                            valves.add(valve);
+                        }
+                        return safetyController.turnDownValve(valves);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "txjk"://通讯监控
+                return AjaxResult.success();
+            case "bxsjcy"://便携式检测仪
+                return AjaxResult.success();
+            case "gygc"://公用工程
+                List<TPssrPublic> publics = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrPublic pssrPublic = new TPssrPublic();
+                    pssrPublic.setSubId(dto.getSubId());
+                    pssrPublic.setId(item.getId());
+                    pssrPublic.setReason(item.getReason());
+                    publics.add(pssrPublic);
+                }
+                return publicController.turnDownPublic(publics);
+            case "hbss"://环保设施
+                List<TPssrTorchvoc> torchvocs = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrTorchvoc torchvoc = new TPssrTorchvoc();
+                    torchvoc.setSubId(dto.getSubId());
+                    torchvoc.setId(item.getId());
+                    torchvoc.setReason(item.getReason());
+                    torchvocs.add(torchvoc);
+                }
+                return torchvocController.turnDownTorchvoc(torchvocs);
+            case "yfl"://原辅料
+                switch (dto.getSubName()) {
+                    case "material":
+                        List<TPssrMaterial> materials = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrMaterial material = new TPssrMaterial();
+                            material.setSubId(dto.getSubId());
+                            material.setId(item.getId());
+                            material.setReason(item.getReason());
+                            materials.add(material);
+                        }
+                        return materialController.turnDownMaterial(materials);
+                    case "raw":
+                        List<TPssrMaterialRaw> raws = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrMaterialRaw raw = new TPssrMaterialRaw();
+                            raw.setSubId(dto.getSubId());
+                            raw.setId(item.getId());
+                            raw.setReason(item.getReason());
+                            raws.add(raw);
+                        }
+                        return materialRawController.turnDownMaterialRaw(raws);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "jb"://机泵
+                switch (dto.getSubName()) {
+                    case "cleaning":
+                        List<TPssrPumpCleaning> cleanings = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrPumpCleaning cleaning = new TPssrPumpCleaning();
+                            cleaning.setSubId(dto.getSubId());
+                            cleaning.setId(item.getId());
+                            cleaning.setReason(item.getReason());
+                            cleanings.add(cleaning);
+                        }
+                        return pumpCleaningController.turnDownPumpCleaning(cleanings);
+                    case "overhaul":
+                        List<TPssrPumpOverhaul> overhauls = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrPumpOverhaul overhaul = new TPssrPumpOverhaul();
+                            overhaul.setSubId(dto.getSubId());
+                            overhaul.setId(item.getId());
+                            overhaul.setReason(item.getReason());
+                            overhauls.add(overhaul);
+                        }
+                        return pumpOverhaulController.turnDownPumpOverhaul(overhauls);
+                    case "fill":
+                        List<TPssrPumpFill> fills = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrPumpFill fill = new TPssrPumpFill();
+                            fill.setSubId(dto.getSubId());
+                            fill.setId(item.getId());
+                            fill.setReason(item.getReason());
+                            fills.add(fill);
+                        }
+                        return pumpFillController.turnDownPumpFill(fills);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "zdj"://支吊架
+                List<TPssrFrame> frames = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrFrame frame = new TPssrFrame();
+                    frame.setSubId(dto.getSubId());
+                    frame.setId(item.getId());
+                    frame.setReason(item.getReason());
+                    frames.add(frame);
+                }
+                return frameController.turnDownFrame(frames);
+            case "tzsb"://特种设备
+                switch (dto.getSubName()) {
+                    case "pipe":
+                        List<TPssrPipe> pipes = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrPipe pipe = new TPssrPipe();
+                            pipe.setSubId(dto.getSubId());
+                            pipe.setId(item.getId());
+                            pipe.setReason(item.getReason());
+                            pipes.add(pipe);
+                        }
+                        return pipeController.turnDownPipe(pipes);
+                    case "vessel":
+                        List<TPssrVessel> vessels = new ArrayList<>();
+                        for (TPssrApproveDto item : dto.getDataList()) {
+                            TPssrVessel vessel = new TPssrVessel();
+                            vessel.setSubId(dto.getSubId());
+                            vessel.setId(item.getId());
+                            vessel.setReason(item.getReason());
+                            vessels.add(vessel);
+                        }
+                        return vesselController.turnDownVessel(vessels);
+                }
+                return AjaxResult.error("驳回失败！");
+            case "ybjy"://仪表校验
+                List<TPssrInstrumentCalibration> calibrations = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrInstrumentCalibration calibration = new TPssrInstrumentCalibration();
+                    calibration.setSubId(dto.getSubId());
+                    calibration.setId(item.getId());
+                    calibration.setReason(item.getReason());
+                    calibrations.add(calibration);
+                }
+                return instrumentCalibrationController.turnDownInstrumentCalibration(calibrations);
+            case "yblscs"://仪表联锁测试
+                return AjaxResult.success();
+            case "bjlszqr"://报警联锁值确认
+                return AjaxResult.success();
+            case "lsdy"://临时电源
+                List<TPssrPower> powers = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrPower power = new TPssrPower();
+                    power.setSubId(dto.getSubId());
+                    power.setId(item.getId());
+                    power.setReason(item.getReason());
+                    powers.add(power);
+                }
+                return powerController.turnDownPower(powers);
+            case "djsb"://电机设备
+                List<TPssrMotor> motors = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrMotor motor = new TPssrMotor();
+                    motor.setSubId(dto.getSubId());
+                    motor.setId(item.getId());
+                    motor.setReason(item.getReason());
+                    motors.add(motor);
+                }
+                return motorController.turnDownMotor(motors);
+            case "zmdbr"://照明、电伴热
+                List<TPssrLighting> lightings = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrLighting lighting = new TPssrLighting();
+                    lighting.setSubId(dto.getSubId());
+                    lighting.setId(item.getId());
+                    lighting.setReason(item.getReason());
+                    lightings.add(lighting);
+                }
+                return lightingController.turnDownLighting(lightings);
+            case "jdjdkj"://静电接地、跨接
+                List<TPssrFranklinism> franklinisms = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrFranklinism franklinism = new TPssrFranklinism();
+                    franklinism.setSubId(dto.getSubId());
+                    franklinism.setId(item.getId());
+                    franklinism.setReason(item.getReason());
+                    franklinisms.add(franklinism);
+                }
+                return franklinismController.turnDownFranklinism(franklinisms);
+            case "qtjcy"://气体检测仪
+                List<TPssrGasdetector> gasdetectors = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrGasdetector gasdetector = new TPssrGasdetector();
+                    gasdetector.setSubId(dto.getSubId());
+                    gasdetector.setId(item.getId());
+                    gasdetector.setReason(item.getReason());
+                    gasdetectors.add(gasdetector);
+                }
+                return gasdetectorController.turnDownGasdetector(gasdetectors);
+            case "zxfxy"://在线分析仪
+                List<TPssrAnalyzer> analyzers = new ArrayList<>();
+                for (TPssrApproveDto item : dto.getDataList()) {
+                    TPssrAnalyzer analyzer = new TPssrAnalyzer();
+                    analyzer.setSubId(dto.getSubId());
+                    analyzer.setId(item.getId());
+                    analyzer.setReason(item.getReason());
+                    analyzers.add(analyzer);
+                }
+                return analyzerController.turnDownAnalyzer(analyzers);
+            default:
+                return AjaxResult.error("驳回失败！");
+        }
     }
 
     /**
@@ -938,7 +1450,7 @@ public class TPssrApproveController extends BaseController {
         String condition = devTask.getCondition();
         TPssrAboveall aboveall = tPssrAboveallService.selectTPssrAboveallById(approve.getAboveallId());
 
-        if (taskName.equals("所有装置经理")) {
+        if (taskName.equals("部门经理")) {
             if (condition.equals("0")) {
                 if (userId.equals(aboveall.getPlantMgr().toString())) {
                     aboveall.setPlantConfirmdate(new Date());
@@ -1459,6 +1971,14 @@ public class TPssrApproveController extends BaseController {
                     path = downloadPath + msg;
                     Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
                     files.add(new File(rootPath + subTitle + msg));
+
+                    TPssrMaterialRaw materialRaw = new TPssrMaterialRaw();
+                    materialRaw.setSubId(tPssrSubcontent.getId());//子表id
+                    result = materialRawController.export(materialRaw);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
                     break;
                 case "jb"://机泵
                     subTitle = "20机泵/";

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -302,7 +302,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
     @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmInstrumentCalibration")
-    public AjaxResult InstrumentCalibration(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+    public AjaxResult confirmInstrumentCalibration(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -299,7 +299,7 @@ public class TPssrMotorController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:power:edit')")
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmMotor")
-    public AjaxResult Motor(@RequestBody TPssrMotor tPssrMotor) {
+    public AjaxResult confirmMotor(@RequestBody TPssrMotor tPssrMotor) {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -214,7 +214,7 @@ public class TPssrPowerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:power:edit')")
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmPower")
-    public AjaxResult Power(@RequestBody TPssrPower tPssrPower) {
+    public AjaxResult confirmPower(@RequestBody TPssrPower tPssrPower) {
         long queryStatus = 0;
         long approveStatus = 0;
         Date date = null;

master/src/main/java/com/ruoyi/project/pssr/domain/dto/TPssrApproveDto.java

@@ -5,6 +5,7 @@ import java.util.List;
 public class TPssrApproveDto {
 
     private Long[] ids;
+    private Long id;
 
     private Long subId;
 
@@ -12,6 +13,34 @@ public class TPssrApproveDto {
 
     private Long taskType;
 
+    private String reason;
+
+    private List<TPssrApproveDto> dataList;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public List<TPssrApproveDto> getDataList() {
+        return dataList;
+    }
+
+    public void setDataList(List<TPssrApproveDto> dataList) {
+        this.dataList = dataList;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public Long getTaskType() {
         return taskType;
     }

master/src/main/resources/processes/pssr/pssrMgrConfirm.bpmn

@@ -2,7 +2,7 @@
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="pssrMgrConfirm" name="PSSR装置经理审批" isExecutable="true">
     <startEvent id="applyUser" name="Start" activiti:initiator="${applyUser}"></startEvent>
-    <userTask id="allJlUser" name="所有装置经理" activiti:assignee="${allJlUser}">
+    <userTask id="allJlUser" name="部门经理" activiti:assignee="${allJlUser}">
         <extensionElements>
             <activiti:taskListener event="create" delegateExpression="${confirmTaskCreateListener}"></activiti:taskListener>
             <!-- 定义多实例任务，使用集合变量 allJlUsers 动态生成 -->

ui/src/views/approve/approveDetail/pssrMgrApprove-detail.vue

@@ -81,7 +81,7 @@ export default {
         console.log(this.taskForm)
       })
       console.log(taskName)
-      if (taskName=='所有装置经理'){
+      if (taskName=='部门经理'){
         this.taskType=1
       }
     },