|
@@ -1167,76 +1167,146 @@ public class TPssrApproveController extends BaseController {
|
|
|
if (judgmentOrder(tPssrSubcontent)) {
|
|
|
return AjaxResult.error("请先完成前置审批流程");
|
|
|
}
|
|
|
- tPssrSubcontent.setApproveStatus(1L);
|
|
|
- tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
|
|
|
switch (tPssrSubcontent.getForShort()) {
|
|
|
case "jxxm"://检修项目
|
|
|
+ if (tPssrOverhaulExchangerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doJxxmApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "kgfa"://开工方案
|
|
|
+ if (tPssrProgrammeService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doKgfaApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "sjbg"://设计变更
|
|
|
+ if (tPssrMocService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doMocApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "mb"://盲板
|
|
|
+ if (tPssrBlindService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doMbApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "xcws"://现场卫生
|
|
|
+ if (tPssrHygieneService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doXcwsApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "rsfh"://人身防护
|
|
|
+ if (tPssrProtectionService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
|
|
|
+ || tPssrMeasureService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doRsfhApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "sbqjd"://设备清洁度
|
|
|
+ if (tPssrCleaningService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doSbqjdApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "qm"://气密
|
|
|
+ if (tPssrAirtightService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doQmApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "sksgfmzt"://锁开锁关阀门状态
|
|
|
+ if (tPssrLockService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doSksgApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "sys"://实验室
|
|
|
+ if (tPssrLaboratoryService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doSysApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "dj"://短接
|
|
|
+ if (tPssrCircuitService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doDjApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "dqzh"://氮气置换
|
|
|
+ if (tPssrNitrogenService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doDqzhApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "xqf"://消气防设施
|
|
|
+ if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doPatrolApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "aqss"://安全设施
|
|
|
+ if (tPssrSafetyBleedService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doAqssApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "txjk"://通讯监控
|
|
|
+ if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doPatrolApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "bxsjcy"://便携式检测仪
|
|
|
+ if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doPatrolApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "gygc"://公用工程
|
|
|
+ if (tPssrPublicService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doGygcApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "hbss"://环保设施
|
|
|
+ if (tPssrTorchvocService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doHbssApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "yfl"://原辅料
|
|
|
+ if (tPssrMaterialService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
|
|
|
+ || tPssrMaterialRawService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doYflApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "jb"://机泵
|
|
|
+ if (tPssrPumpCleaningService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doJbApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "zdj"://支吊架
|
|
|
+ if (tPssrFrameService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doZdjApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "tzsb"://特种设备
|
|
|
+ if (tPssrPipeService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
|
|
|
+ || tPssrVesselService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doTzsbApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "ybjy"://仪表校验
|
|
|
+ if (tPssrInstrumentCalibrationService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doYbjyApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "yblscs"://仪表联锁测试
|
|
@@ -1246,26 +1316,46 @@ public class TPssrApproveController extends BaseController {
|
|
|
doBjlszqrApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "lsdy"://临时电源
|
|
|
+ if (tPssrPowerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doLsdyApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "djsb"://电机设备
|
|
|
+ if (tPssrMotorService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doDjsbApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "zmdbr"://照明、电伴热
|
|
|
+ if (tPssrLightingService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doZmdbrApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "jdjdkj"://静电接地、跨接
|
|
|
+ if (tPssrFranklinismService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doJdjdkjApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "qtjcy"://气体检测仪
|
|
|
+ if (tPssrGasdetectorService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doQtjcyApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
case "zxfxy"://在线分析仪
|
|
|
+ if (tPssrAnalyzerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
|
|
|
+ return AjaxResult.error("请确认所有确认人都已选择!");
|
|
|
+ }
|
|
|
doZxfxyApprove(tPssrSubcontent);
|
|
|
break;
|
|
|
default:
|
|
|
return AjaxResult.error("申请发起失败!");
|
|
|
}
|
|
|
+ tPssrSubcontent.setApproveStatus(1L);
|
|
|
+ tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|