工厂模型 设备ABC修改

qushaowei

2023-10-07 3858c775f565df000a45afd9a0c38c7b6bb39069

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

@@ -17,10 +17,6 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
//import org.jeecg.modules.system.entity.SysUpload;
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
//import org.jeecg.modules.system.service.IUploadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -107,27 +104,8 @@
        List<Map<String, Object>> records = maintenanceStandardList.getRecords();
        for (Map<String, Object> record : records) {
            String maintenanceStandardId = (String) record.get("id");
            List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId);
//            for (Map<String, Object> detail : maintenanceStandardDetaillist) {
//                //获取是否有无异常照片数据
////                List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String)detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
//                List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
//                if (sysUploadRelas.size() > 0) {
//                    detail.put("isNoPhotoFlag", true);
////                    List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
//                    List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
//                    SysUpload upload = new SysUpload();
//                    if (CollectionUtils.isNotEmpty(uploadRelas)) {
////                        upload = uploadService.getById(uploadRelas.get(0).getUploadId());
//                        upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
//                    }
//                    detail.put("upload", upload);
//                } else {
//                    detail.put("isNoPhotoFlag", false);
//                    SysUpload upload = new SysUpload();
//                    detail.put("upload", upload);
//                }
//            }
            String equipmentId = (String) record.get("equipmentId");
            List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId,equipmentId);
            record.put("maintenanceStandardDetaillist", maintenanceStandardDetaillist);
        }
        return Result.ok(maintenanceStandardList);
@@ -289,6 +267,7 @@
        List<MaintenanceStandardWorkInstruction> maintenanceStandardWorkInstructionList = maintenanceStandardWorkInstructionService.lambdaQuery().eq(MaintenanceStandardWorkInstruction::getMaintenanceStandardId,maintenanceStandard.getId())
                .eq(MaintenanceStandardWorkInstruction::getDelFlag, CommonConstant.DEL_FLAG_0).list();
        maintenanceStandard.setId("");
        maintenanceStandard.setCreateTime(new Date());
        maintenanceStandardService.save(maintenanceStandard);
        //明细信息
        List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
@@ -365,8 +344,10 @@
                .eq(MaintenanceStandard::getVersionStatus, "2").list();
        for (MaintenanceStandard standard : maintenanceStandardList) {
            standard.setVersionStatus("3");
            standard.setLoseEfficacyTime(new Date());
            maintenanceStandardService.updateById(standard);
        }
        maintenanceStandard.setTakeEffectTime(new Date());
        boolean b = maintenanceStandardService.updateById(maintenanceStandard);
        if (b){
            return Result.OK("生效成功!");