问题项修改

qushaowei

2024-01-11 0581d9986b4d14cdf8a6f66a929674224dd45b2f

问题项修改

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

@@ -308,6 +308,7 @@
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））
        dailyMaintenanceOrder.setStoveExemptStatus("0");//炉类设备豁免20项状态（0未确认，1维修室主任，2保养人员，3仪表工）
        dailyMaintenanceOrder.setStatus("3");//3:未开始
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {

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

@@ -231,7 +231,7 @@
             dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
             dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
             dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
             dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
             dailyMaintenanceOrder.setStatus("3");//3:未开始
             dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
             dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
             List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());

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

@@ -117,7 +117,7 @@
        LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        equipmentReportRepair.setStatus("1");
        equipmentReportRepair.setSource("1");
        equipmentReportRepair.setType("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

@@ -187,6 +187,7 @@
        }
        inspectionOrder.setInspectionDeadline(date);
        inspectionOrder.setInspectionStandardType("1");
        inspectionOrder.setStatus("3");//3:未开始
        inspectionOrderService.save(inspectionOrder);

        String equipmentId = inspectionOrder.getEquipmentId();

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

@@ -85,7 +85,7 @@
    /**状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）*/
    @Excel(name = "状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）", width = 15)
    @ApiModelProperty(value = "状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）")
    private String status = CommonConstant.STATUS_1;
    private String status;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)
    @ApiModelProperty(value = "备用字段1")

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

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

    /*********************************************** 扩 展 字 段 ********************************************************/

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

@@ -143,7 +143,7 @@
    /**状态*/
    @Excel(name = "状态", width = 15)
    @ApiModelProperty(value = "状态")
    private String status = DailyInspectionOrder.STATUS_1;
    private String status;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)
    @ApiModelProperty(value = "备用字段1")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java

@@ -132,6 +132,7 @@
                inspectionOrder.setInspectionStandardType("1");
                inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
                inspectionOrder.setTeamId(inspectionCycle.getTeamId());
                inspectionOrder.setStatus("3");
                inspectionOrderService.save(inspectionOrder);

                Equipment equipment = equipmentService.getById(inspectionCycle.getEquipmentId());
@@ -198,6 +199,7 @@
                inspectionOrder.setInspectionStandardType("1");
                inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
                inspectionOrder.setTeamId(inspectionCycle.getTeamId());
                inspectionOrder.setStatus("3");
                inspectionOrderService.save(inspectionOrder);
                //保存点检工单子表数据
                List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()

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

@@ -14,6 +14,6 @@
 * @Version: V1.0
 */
public interface StreamMapper extends BaseMapper<Stream> {
     List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId);
     List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId,@Param("num") String num);

}

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

@@ -14,6 +14,7 @@
        t1.is_stop isStop,
        t1.approval approval,
        t1.fault_time faultTime,
        t1.type,
        t1.source source,
        t1.source_id sourceId,
        t1.urgency urgency,

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

@@ -6,6 +6,9 @@
        from mom_eam_stream t1
        left join sys_user t2 on t2.id = t1.create_by
        where 1=1
        <if test="num != null and num != ''">
            and t1.num like concat('%',#{num},'%')
        </if>
        <choose>
            <when test="areaId != null and areaId != ''">
                and t2.area_id = #{areaId}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java

@@ -49,7 +49,7 @@

    @Override
    public Page<Stream> myPage(Page<Stream> page, Stream stream) {
        return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
        return page.setRecords(baseMapper.myPage(page,stream.getAreaId(),stream.getNum()));
    }