鉴定工单调整

zenglf

2023-10-25 f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70

鉴定工单调整

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

@@ -452,44 +452,44 @@
        QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap());
        Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize);
        IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper);
        for (CalibrationOrder record : pageList.getRecords()) {
            String id = record.getId();
            String status = record.getStatus();
            String managementMode = record.getManagementMode();
            String equipmentId = record.getEquipmentId();
            Equipment equipment = equipmentService.getById(equipmentId);
            if(equipment != null){
                record.setEquipmentNum(equipment.getNum());
                record.setEquipmentName(equipment.getName());
                record.setEquipmentModel(equipment.getModel());
                record.setEquipmentSpecification(equipment.getSpecification());
            }
            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
            record.setPrecisionParameterList(precisionParameterList);
            if("4".equals(status)){
                if("data".equals(managementMode)){
                    List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
                            .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
                            .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
                            .eq(CalibrationOrderDetail::getDelFlag,"0").list();
                    if(calibrationOrderDetails.size()>0){
                        record.setCalibrationResult("异常");
                    }else{
                        record.setCalibrationResult("正常");
                    }
                }else{
                    List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
                            .eq(CalibrationOrderReport::getCalibrationOrderId, id)
                            .eq(CalibrationOrderReport::getJudgmentResult, "fail")
                            .eq(CalibrationOrderReport::getDelFlag, "0").list();
                    if(calibrationOrderReports.size()>0){
                        record.setCalibrationResult("异常");
                    }else{
                        record.setCalibrationResult("正常");
                    }
                }
            }
        }
//        for (CalibrationOrder record : pageList.getRecords()) {
//            String id = record.getId();
//            String status = record.getStatus();
//            String managementMode = record.getManagementMode();
//            String equipmentId = record.getEquipmentId();
//            Equipment equipment = equipmentService.getById(equipmentId);
//            if(equipment != null){
//                record.setEquipmentNum(equipment.getNum());
//                record.setEquipmentName(equipment.getName());
//                record.setEquipmentModel(equipment.getModel());
//                record.setEquipmentSpecification(equipment.getSpecification());
//            }
//            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
//            record.setPrecisionParameterList(precisionParameterList);
//            if("4".equals(status)){
//                if("data".equals(managementMode)){
//                    List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
//                            .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
//                            .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
//                            .eq(CalibrationOrderDetail::getDelFlag,"0").list();
//                    if(calibrationOrderDetails.size()>0){
//                        record.setCalibrationResult("异常");
//                    }else{
//                        record.setCalibrationResult("正常");
//                    }
//                }else{
//                    List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
//                            .eq(CalibrationOrderReport::getCalibrationOrderId, id)
//                            .eq(CalibrationOrderReport::getJudgmentResult, "fail")
//                            .eq(CalibrationOrderReport::getDelFlag, "0").list();
//                    if(calibrationOrderReports.size()>0){
//                        record.setCalibrationResult("异常");
//                    }else{
//                        record.setCalibrationResult("正常");
//                    }
//                }
//            }
//        }
        return Result.OK(pageList);
    }
    /**

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

@@ -1,9 +1,6 @@
package org.jeecg.modules.eam.controller;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -13,6 +10,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -20,7 +18,9 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.CalibrationOrder;
import org.jeecg.modules.eam.entity.CalibrationOrderReport;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentDocument;
import org.jeecg.modules.eam.service.ICalibrationOrderReportService;

@@ -29,6 +29,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.eam.service.ICalibrationOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -46,194 +48,211 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: mom_eam_calibration_order_report
 * @Author: jeecg-boot
 * @Date:   2023-07-20
 * @Date: 2023-07-20
 * @Version: V1.0
 */
@Api(tags="mom_eam_calibration_order_report")
@Api(tags = "mom_eam_calibration_order_report")
@RestController
@RequestMapping("/eam/calibrationOrderReport")
@Slf4j
public class CalibrationOrderReportController extends JeecgController<CalibrationOrderReport, ICalibrationOrderReportService> {
    @Autowired
    private ICalibrationOrderReportService calibrationOrderReportService;
    @Autowired
    private ICalibrationOrderReportService calibrationOrderReportService;

     @Autowired
     private ISysBaseAPI sysBaseApi;
	
    /**
     * 分页列表查询
     *
     * @param calibrationOrderReport
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_calibration_order_report-分页列表查询")
    @ApiOperation(value="mom_eam_calibration_order_report-分页列表查询", notes="mom_eam_calibration_order_report-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<CalibrationOrderReport> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderReport, req.getParameterMap());
        Page<CalibrationOrderReport> page = new Page<CalibrationOrderReport>(pageNo, pageSize);
        IPage<CalibrationOrderReport> pageList = calibrationOrderReportService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    @Autowired
    private ICalibrationOrderService calibrationOrderService;
    @Autowired
    private ISysBaseAPI sysBaseApi;

     /**
      * 添加
      *
      * @return
      */
     @PostMapping(value = "/add")
     @Transactional(rollbackFor = {Exception.class})
     public Result<?> add(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
         String str = request.getParameter("data");
         JSONObject json = JSONObject.parseObject(str);

         boolean isFileChange = true;
         String uploadId = json.getString("uploadId");
         String fileType = json.getString("fileType");
         String description = json.getString("remark");
         String type = json.getString("type");

         CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
         calibrationOrderReport.setType(fileType);
         calibrationOrderReportService.save(calibrationOrderReport);
         // 文件变更
         if (isFileChange) {
             if (StrUtils.isNotBlankOrNull(uploadId)) {
                 // 情形一、从文件管理中选择
//                 uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
             } else {
                 // 情形二、重新上传
                 // 1、持久upload
                 MultipartFile multipartFile = request.getFile("file");
                 List<MultipartFile> multipartFileList = new ArrayList<>();
                 multipartFileList.add(multipartFile);
//                List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
//                // 2、创建/修改 uploadRela
//                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
//                uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
                 List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
                 // 2、创建/修改 uploadRela
                 // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
                 sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
             }
         }

         return Result.ok("上传成功!");
     }

     @PostMapping(value = "/edit")
     @Transactional(rollbackFor = {Exception.class})
     public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
         String str = request.getParameter("data");
         JSONObject json = JSONObject.parseObject(str);

         boolean isFileChange = json.getBoolean("isFileChange");
         String uploadId = json.getString("uploadId");
         String fileType = json.getString("fileType");
         String description = json.getString("remark");
         String type = json.getString("type");

         CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
         calibrationOrderReport.setType(fileType);
         calibrationOrderReportService.saveOrUpdate(calibrationOrderReport);
         // 文件变更
         if (isFileChange) {
             if (StrUtils.isNotBlankOrNull(uploadId)) {
                 // 情形一、从文件管理中选择
//                 uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
             } else {
                 // 情形二、重新上传
                 // 1、持久upload
                 MultipartFile multipartFile = request.getFile("file");
                 List<MultipartFile> multipartFileList = new ArrayList<>();
                 multipartFileList.add(multipartFile);
//                List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
//                // 2、创建/修改 uploadRela
//                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
//                uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
                 List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
                 // 2、创建/修改 uploadRela
                 // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
                 sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
             }
         }

         return Result.ok("上传成功!");
     }


     /**
     *   通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_calibration_order_report-通过id删除")
    @ApiOperation(value="mom_eam_calibration_order_report-通过id删除", notes="mom_eam_calibration_order_report-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        //删除文件管理与业务数据关系
//        List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, id).eq(SysUploadRela::getDelFlag, 0).list();
        List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType(id, null);
        for (SysUploadRela sysUploadRela : sysUploadRelas) {
            String uploadId = sysUploadRela.getUploadId();
//            uploadService.removeById(uploadId);
//            uploadRelaService.removeById(sysUploadRela);
            sysBaseApi.removeUploadById(uploadId);
            sysBaseApi.removeUploadRelaById(sysUploadRela.getId());
        }
        calibrationOrderReportService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_calibration_order_report-批量删除")
    @ApiOperation(value="mom_eam_calibration_order_report-批量删除", notes="mom_eam_calibration_order_report-批量删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.calibrationOrderReportService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_eam_calibration_order_report-通过id查询")
    @ApiOperation(value="mom_eam_calibration_order_report-通过id查询", notes="mom_eam_calibration_order_report-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CalibrationOrderReport> queryById(@RequestParam(name="id",required=true) String id) {
        CalibrationOrderReport calibrationOrderReport = calibrationOrderReportService.getById(id);
        if(calibrationOrderReport==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(calibrationOrderReport);
    }
    @Autowired
    private IEamEquipmentService eamEquipmentService;

    /**
    * 导出excel
    *
    * @param request
    * @param calibrationOrderReport
    */
     * 分页列表查询
     *
     * @param calibrationOrderReport
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_calibration_order_report-分页列表查询")
    @ApiOperation(value = "mom_eam_calibration_order_report-分页列表查询", notes = "mom_eam_calibration_order_report-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
        QueryWrapper<CalibrationOrderReport> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderReport, req.getParameterMap());
        Page<CalibrationOrderReport> page = new Page<CalibrationOrderReport>(pageNo, pageSize);
        IPage<CalibrationOrderReport> pageList = calibrationOrderReportService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * 添加
     *
     * @return
     */
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = {Exception.class})
    public Result<?> add(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
        String str = request.getParameter("data");
        JSONObject json = JSONObject.parseObject(str);

        boolean isFileChange = true;
        String uploadId = json.getString("uploadId");
        String fileType = json.getString("fileType");
        String description = json.getString("remark");
        String type = json.getString("type");

        CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
        calibrationOrderReport.setType(fileType);
        calibrationOrderReportService.save(calibrationOrderReport);

        // 文件变更
        if (isFileChange) {
            if (StrUtils.isNotBlankOrNull(uploadId)) {
                // 情形一、从文件管理中选择
//                 uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
            } else {
                // 情形二、重新上传
                // 1、持久upload
                MultipartFile multipartFile = request.getFile("file");
                List<MultipartFile> multipartFileList = new ArrayList<>();
                multipartFileList.add(multipartFile);
//                List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
//                // 2、创建/修改 uploadRela
//                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
//                uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
                List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
                // 2、创建/修改 uploadRela
                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
                sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
            }
        }
        // 更新主表为已完成
        CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getCalibrationOrderId());
        // status 已完成
        calibrationOrder.setStatus("4");
        calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
        calibrationOrder.setCalibrationTime(new Date());
        calibrationOrderService.updateById(calibrationOrder);
        // 更新设备技术状态
        Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId());

        if (StringUtils.isNotBlank(equipment.getId())) {
            equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
            eamEquipmentService.updateById(equipment);
        }

        return Result.ok("上传成功!");
    }

    @PostMapping(value = "/edit")
    @Transactional(rollbackFor = {Exception.class})
    public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
        String str = request.getParameter("data");
        JSONObject json = JSONObject.parseObject(str);

        boolean isFileChange = json.getBoolean("isFileChange");
        String uploadId = json.getString("uploadId");
        String fileType = json.getString("fileType");
        String description = json.getString("remark");
        String type = json.getString("type");

        CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
        calibrationOrderReport.setType(fileType);
        calibrationOrderReportService.saveOrUpdate(calibrationOrderReport);
        // 文件变更
        if (isFileChange) {
            if (StrUtils.isNotBlankOrNull(uploadId)) {
                // 情形一、从文件管理中选择
//                 uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
            } else {
                // 情形二、重新上传
                // 1、持久upload
                MultipartFile multipartFile = request.getFile("file");
                List<MultipartFile> multipartFileList = new ArrayList<>();
                multipartFileList.add(multipartFile);
//                List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
//                // 2、创建/修改 uploadRela
//                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
//                uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
                List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
                // 2、创建/修改 uploadRela
                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
                sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
            }
        }

        return Result.ok("上传成功!");
    }


    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_calibration_order_report-通过id删除")
    @ApiOperation(value = "mom_eam_calibration_order_report-通过id删除", notes = "mom_eam_calibration_order_report-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        //删除文件管理与业务数据关系
//        List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, id).eq(SysUploadRela::getDelFlag, 0).list();
        List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType(id, null);
        for (SysUploadRela sysUploadRela : sysUploadRelas) {
            String uploadId = sysUploadRela.getUploadId();
//            uploadService.removeById(uploadId);
//            uploadRelaService.removeById(sysUploadRela);
            sysBaseApi.removeUploadById(uploadId);
            sysBaseApi.removeUploadRelaById(sysUploadRela.getId());
        }
        calibrationOrderReportService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_calibration_order_report-批量删除")
    @ApiOperation(value = "mom_eam_calibration_order_report-批量删除", notes = "mom_eam_calibration_order_report-批量删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.calibrationOrderReportService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_eam_calibration_order_report-通过id查询")
    @ApiOperation(value = "mom_eam_calibration_order_report-通过id查询", notes = "mom_eam_calibration_order_report-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CalibrationOrderReport> queryById(@RequestParam(name = "id", required = true) String id) {
        CalibrationOrderReport calibrationOrderReport = calibrationOrderReportService.getById(id);
        if (calibrationOrderReport == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(calibrationOrderReport);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param calibrationOrderReport
     */
    //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CalibrationOrderReport calibrationOrderReport) {
@@ -241,12 +260,12 @@
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("mom_eam_calibration_order_report:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
@@ -254,34 +273,34 @@
    }


     /**
      * 设备检定 获取检定报告
      * qsw 2023-7-20
      */
     @GetMapping("getCalibrationOrderReportList")
     public Result<?> getCalibrationOrderReportList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
         IPage<Map<String, Object>> calibrationOrderReports = calibrationOrderReportService.getCalibrationOrderReportById(pageNo, pageSize, params);
         for (Map<String, Object> calibrationOrderReport : calibrationOrderReports.getRecords()) {
             //获取是否有无异常照片数据
    /**
     * 设备检定 获取检定报告
     * qsw 2023-7-20
     */
    @GetMapping("getCalibrationOrderReportList")
    public Result<?> getCalibrationOrderReportList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> calibrationOrderReports = calibrationOrderReportService.getCalibrationOrderReportById(pageNo, pageSize, params);
        for (Map<String, Object> calibrationOrderReport : calibrationOrderReports.getRecords()) {
            //获取是否有无异常照片数据
//            List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) calibrationOrderReport.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
             List<SysUploadRela> sysUploadRelas =sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), null);
             if (sysUploadRelas.size() > 0) {
            List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), null);
            if (sysUploadRelas.size() > 0) {

//                List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
                 List<SysUploadRela> uploadRelas =   sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
                 SysUpload upload = new SysUpload();
                 if (CollectionUtils.isNotEmpty(uploadRelas)) {
                     //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
                     upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
                 }
                 calibrationOrderReport.put("upload", upload);
             } else {
                List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
                SysUpload upload = new SysUpload();
                if (CollectionUtils.isNotEmpty(uploadRelas)) {
                    //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
                    upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
                }
                calibrationOrderReport.put("upload", upload);
            } else {

                 SysUpload upload = new SysUpload();
                 calibrationOrderReport.put("upload", upload);
             }
         }
         return Result.ok(calibrationOrderReports);
     }
                SysUpload upload = new SysUpload();
                calibrationOrderReport.put("upload", upload);
            }
        }
        return Result.ok(calibrationOrderReports);
    }

}

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

@@ -468,34 +468,34 @@
     @GetMapping(value = "/getResumeCalibrationRecordList")
     public Result<?> getResumeCalibrationRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
         IPage<Map<String, Object>> resumeCalibrationRecordList = equipmentService.getResumeCalibrationRecordList(pageNo, pageSize, params);
         for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) {
             String id = (String)record.get("id");
             String status = (String)record.get("status");
             String managementMode = (String)record.get("managementMode");
             if("4".equals(status)){
                 if("data".equals(managementMode)){
                     List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
                             .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
                             .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
                             .eq(CalibrationOrderDetail::getDelFlag,"0").list();
                     if(calibrationOrderDetails.size()>0){
                         record.put("calibrationResult","异常");
                     }else{
                         record.put("calibrationResult","正常常");
                     }
                 }else{
                     List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
                             .eq(CalibrationOrderReport::getCalibrationOrderId, id)
                             .eq(CalibrationOrderReport::getJudgmentResult, "fail")
                             .eq(CalibrationOrderReport::getDelFlag, "0").list();
                     if(calibrationOrderReports.size()>0){
                         record.put("calibrationResult","异常");
                     }else{
                         record.put("calibrationResult","正常常");
                     }
                 }
             }
         }
//         for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) {
//             String id = (String)record.get("id");
//             String status = (String)record.get("status");
//             String managementMode = (String)record.get("managementMode");
//             if("4".equals(status)){
//                 if("data".equals(managementMode)){
//                     List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
//                             .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
//                             .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
//                             .eq(CalibrationOrderDetail::getDelFlag,"0").list();
//                     if(calibrationOrderDetails.size()>0){
//                         record.put("calibrationResult","异常");
//                     }else{
//                         record.put("calibrationResult","正常常");
//                     }
//                 }else{
//                     List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
//                             .eq(CalibrationOrderReport::getCalibrationOrderId, id)
//                             .eq(CalibrationOrderReport::getJudgmentResult, "fail")
//                             .eq(CalibrationOrderReport::getDelFlag, "0").list();
//                     if(calibrationOrderReports.size()>0){
//                         record.put("calibrationResult","异常");
//                     }else{
//                         record.put("calibrationResult","正常常");
//                     }
//                 }
//             }
//         }
         return Result.ok(resumeCalibrationRecordList);
     }


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

@@ -80,6 +80,7 @@
     */
    @Excel(name = "检定结果", width = 15)
    @ApiModelProperty(value = "检定结果")
    @Dict(dicCode = "technology_status")
    private String calibrationResult;
    /**
     * 检定结果描述

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

@@ -17,7 +17,7 @@
        left join mom_sys_upload_rela t4 on t4.bus_id = t1.id
        LEFT JOIN mom_sys_upload t2 ON t4.upload_id = t2.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'common_upload_type' ) t3 ON t3.item_value = t2.type
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'judgment_result' ) t5 ON t5.item_value = t1.judgment_result
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t5 ON t5.item_value = t1.judgment_result
        WHERE t1.del_flag = 0
        <if test="params.calibrationOrderId != null and params.calibrationOrderId != ''">
            and t1.calibration_order_id = #{params.calibrationOrderId}

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

@@ -7,6 +7,7 @@
import org.jeecg.modules.eam.mapper.CalibrationOrderMapper;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.ICalibrationOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@
    @Autowired
    private CalibrationOrderDetailMapper calibrationOrderDetailMapper;


    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveMain(CalibrationOrder calibrationOrder, List<CalibrationOrderDetail> calibrationOrderDetailList) {