提价

qushaowei

2023-12-29 b2580407f2d0d1428bcb77963fcdd897ed552827

提价

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

@@ -462,6 +462,7 @@
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandard.setId("");
        dailyInspectionStandard.setAssignMode("1");
        dailyInspectionStandard.setApprovalStatus("1");
        dailyInspectionStandard.setCreateTime(new Date());
        dailyInspectionStandard.setTakeEffectTime(null);

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

@@ -106,6 +106,7 @@
        LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        equipmentReportRepair.setStatus("1");
        equipmentReportRepair.setSource("1");
        equipmentReportRepair.setType("1");
        equipmentReportRepair.setIsCreateOrder(0);
        equipmentReportRepairService.save(equipmentReportRepair);
        String IS_PRODUCT_YES = "yes";

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

@@ -555,6 +555,7 @@
                 equipmentReportRepair.setNum(num);
                 equipmentReportRepair.setStatus("1");
                 equipmentReportRepair.setSource("2");
                 equipmentReportRepair.setType("2");//类型（1被动报修，2主动报修）
                 equipmentReportRepair.setIsCreateOrder(0);
                 equipmentReportRepair.setEquipmentId(inspectionOrder.getEquipmentId());
                 equipmentReportRepair.setFaultDescription(orderDetail.getAbnormalDesc());

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

@@ -149,6 +149,12 @@
    @ApiModelProperty(value = "来源Id")
    private String sourceId;

    /**
     * qsw 2023-12-29
     */
    @ApiModelProperty(value = "类型（1被动报修，2主动报修）")
    private String type;

    /*********************************************** 扩 展 字 段 ********************************************************/
    /**
     * 设备编号

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

@@ -15,6 +15,7 @@
            t1.approval approval,
            t1.fault_time faultTime,
            t1.source source,
            t1.type,
            t1.source_id sourceId,
            t1.urgency urgency,
            t1.is_create_order isCreateOrder,