细节修改

“linengliang”

2023-11-18 3363cc541bf40b48269950e1f6e6c87eec4603e6

细节修改

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

@@ -121,28 +121,28 @@
                                   HttpServletRequest req) {
        Page<RepairOrder> page = new Page<RepairOrder>(pageNo, pageSize);
        IPage<RepairOrder> pageList = repairOrderService.getRepairOrderList(page, repairOrder);
        for(RepairOrder repairOrder1 : pageList.getRecords()){
            if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
                EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
                repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
            }
            if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
                ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
                repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
            }

            String id = repairOrder1.getId();
            QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
            wrapper.eq("repair_order_id", id)
                    .eq("del_flag", 0);
            wrapper.select("sum(actual_hour) as actualHour");
            Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
            BigDecimal actualHour = new BigDecimal(0);
            if (map != null) {
                actualHour = (BigDecimal) map.get("actualHour");
            }
            repairOrder1.setActualHour(actualHour);
        }
//        for(RepairOrder repairOrder1 : pageList.getRecords()){
//            if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
//                EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
//                repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
//            }
//            if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
//                ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
//                repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
//            }
//
//            String id = repairOrder1.getId();
//            QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
//            wrapper.eq("repair_order_id", id)
//                    .eq("del_flag", 0);
//            wrapper.select("sum(actual_hour) as actualHour");
//            Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
//            BigDecimal actualHour = new BigDecimal(0);
//            if (map != null) {
//                actualHour = (BigDecimal) map.get("actualHour");
//            }
//            repairOrder1.setActualHour(actualHour);
//        }
        return Result.OK(pageList);
    }


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

@@ -16,7 +16,7 @@
               t1.end_time                                    endTime,
               t1.principal_contractor                        principalContractor,
               t1.theoretical_time                            theoreticalTime,
               t6.item_text                                   principalContractor_dictText,
               t7.item_text                                   principalContractor_dictText,
               t1.user_num                                 as userNum,
               t2.id                                          userId,
               t1.repair_order_id                          as repairOrderId,
@@ -32,8 +32,8 @@
                 LEFT JOIN mom_eam_repair_order t5 on t5.id = t1.repair_order_id
                 LEFT JOIN mom_eam_equipment t6 on t6.id = t5.equipment_id

                 left join (select * from v_sys_dict where dict_code = 'yn') t6
                           on t1.principal_contractor = t6.item_value
                 left join (select * from v_sys_dict where dict_code = 'yn') t7
                           on t1.principal_contractor = t7.item_value
        WHERE t1.repair_order_id = #{mainId}
          and t1.del_flag = 0


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

@@ -34,6 +34,7 @@
        t1.business_type businessType,
        t1.responsibility_id responsibilityId,
        t1.outsourcing_unit outsourcingUnit,
        t1.actual_hour actualHour,
        t1.remark,
        t1.repair_order_uda1 repairOrderUda1,
        t1.repair_order_uda2 repairOrderUda2,

 lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16(lnl)/sys_dict_update.sql

@@ -156,3 +156,10 @@
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment_report_repair',
    'COLUMN', N'fault_hour'
ALTER TABLE [dbo].[mom_eam_repair_order] ALTER COLUMN [actual_hour] decimal(10,3) NULL
ALTER TABLE [dbo].[mom_eam_repair_order] ALTER COLUMN [spare_time] decimal(18,3) NULL
    GO

ALTER TABLE [dbo].[mom_eam_repair_order] ALTER COLUMN [part_time] decimal(18,3) NULL

ALTER TABLE [dbo].[mom_eam_equipment_report_repair] ALTER COLUMN [fault_hour] decimal(18,3) NULL