三保 授权 二保 移交单修改

qushaowei

2023-10-28 5e113d775e0143f3ad86e8122aac8015b5d78f1e

三保 授权  二保  移交单修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java

@@ -13,10 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.jeecg.modules.eam.service.IPrecisionParametersService;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -49,6 +46,9 @@

    @Autowired
    private IPrecisionParametersService precisionParametersService;

    @Autowired
    private IEamEquipmentService equipmentService;
    
    /**
     * 分页列表查询
@@ -205,6 +205,7 @@

        PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
        Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
        String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

        if ("0".equals(precisionInspectionStatus)){
@@ -238,12 +239,14 @@

            maintenanceOrder.setPrecisionInspectionStatus("5");
//            maintenanceOrder.setStatus("8");
            //更新设备技术状态
            equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
        }

        preInspection.setRemark(precisionInspection.getRemark());
        dailyMaintenanceOrderService.updateById(maintenanceOrder);
        precisionInspectionService.updateById(preInspection);

        equipmentService.updateById(equipment);
        return Result.OK("审批成功!");
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrderDetail.java

@@ -52,7 +52,7 @@
    /**点检项目id*/
    @Excel(name = "点检项目id", width = 15)
    @ApiModelProperty(value = "点检项目id")
    @Dict(dictTable = "mom_eam_inspection_project", dicCode = "id", dicText = "num")
    @Dict(dictTable = "mom_eam_inspection_project", dicCode = "id", dicText = "name")
    private String inspectionProjectId;
    /**序号*/
    @Excel(name = "序号", width = 15)

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml

@@ -16,7 +16,8 @@
            t3.maintenance_require as maintenanceRequire,
            concat(t6.code, '/', t6.name) as maintenanceCycleName,
            t5.name as maintenanceSpecialtyName,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail t1
        LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml

@@ -10,6 +10,7 @@
            t1.photo,
            t1.maintenance_project_id as maintenanceProjectId,
            t3.num as maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text as maintenanceMethod,
            t3.maintenance_tool as maintenanceTool
@@ -112,11 +113,15 @@
            t1.location,
            t1.photo,
            t1.maintenance_project_id AS maintenanceProjectId,
            case t1.maintenance_role when 'operator' then '操作人员保养内容' else '维修人员保养内容' end as maintenanceRole,
            t3.num AS maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text AS maintenanceMethod,
            t3.maintenance_tool AS maintenanceTool,
            t3.working_hour_quota AS workingHourQuota
            t3.working_hour_quota AS workingHourQuota,
            tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail tt
                LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -81,6 +81,7 @@
            t1.photo,
            t1.inspection_project_id as inspectionProjectId,
            t3.num as inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard as detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method as inspectionMethod,
@@ -111,6 +112,7 @@
            t1.photo,
            t1.inspection_project_id AS inspectionProjectId,
            t3.num AS inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard AS detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method AS inspectionMethod,