Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

 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;
@@ -61,7 +63,12 @@
   private ICalibrationOrderReportService calibrationOrderReportService;

    @Autowired
    private ICalibrationOrderService calibrationOrderService;
    @Autowired
    private ISysBaseAPI sysBaseApi;

    @Autowired
    private IEamEquipmentService eamEquipmentService;
   
   /**
    * 分页列表查询
@@ -75,10 +82,7 @@
   //@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) {
    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);
@@ -105,6 +109,7 @@
       CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
       calibrationOrderReport.setType(fileType);
       calibrationOrderReportService.save(calibrationOrderReport);

       // 文件变更
       if (isFileChange) {
          if (StrUtils.isNotBlankOrNull(uploadId)) {
@@ -126,6 +131,20 @@
             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("上传成功!");
    }