Merge remote-tracking branch 'origin/master'

cuilei

2025-06-20 ac4d1a5962441156ff22a0c87f4eacc083daa9a6

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

@@ -1,167 +1,115 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

 /**
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * @Description: 设备三级保养明细
 * @Author: jeecg-boot
 * @Date:   2025-04-29
 * @Date: 2025-04-29
 * @Version: V1.0
 */
@Slf4j
@Api(tags="设备三级保养明细")
@Api(tags = "设备三级保养明细")
@RestController
@RequestMapping("/eam/eamThirdMaintenanceOrderDetail")
@RequestMapping("/eam/thirdMaintenanceOrderDetail")
public class EamThirdMaintenanceOrderDetailController extends JeecgController<EamThirdMaintenanceOrderDetail, IEamThirdMaintenanceOrderDetailService> {
   @Autowired
   private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
	
   /**
    * 分页列表查询
    *
    * @param eamThirdMaintenanceOrderDetail
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   @AutoLog(value = "设备三级保养明细-分页列表查询")
   @ApiOperation(value="设备三级保养明细-分页列表查询", notes="设备三级保养明细-分页列表查询")
   @GetMapping(value = "/list")
   public Result<?> queryPageList(EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceOrderDetail, req.getParameterMap());
      Page<EamThirdMaintenanceOrderDetail> page = new Page<EamThirdMaintenanceOrderDetail>(pageNo, pageSize);
      IPage<EamThirdMaintenanceOrderDetail> pageList = eamThirdMaintenanceOrderDetailService.page(page, queryWrapper);
      return Result.OK(pageList);
   }
	
   /**
    * 添加
    *
    * @param eamThirdMaintenanceOrderDetail
    * @return
    */
   @AutoLog(value = "设备三级保养明细-添加")
   @ApiOperation(value="设备三级保养明细-添加", notes="设备三级保养明细-添加")
   @PostMapping(value = "/add")
   public Result<?> add(@RequestBody EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
      eamThirdMaintenanceOrderDetailService.save(eamThirdMaintenanceOrderDetail);
      return Result.OK("添加成功！");
   }
	
   /**
    * 编辑
    *
    * @param eamThirdMaintenanceOrderDetail
    * @return
    */
   @AutoLog(value = "设备三级保养明细-编辑")
   @ApiOperation(value="设备三级保养明细-编辑", notes="设备三级保养明细-编辑")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<?> edit(@RequestBody EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
      eamThirdMaintenanceOrderDetailService.updateById(eamThirdMaintenanceOrderDetail);
      return Result.OK("编辑成功!");
   }
	
   /**
    * 通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "设备三级保养明细-通过id删除")
   @ApiOperation(value="设备三级保养明细-通过id删除", notes="设备三级保养明细-通过id删除")
   @DeleteMapping(value = "/delete")
   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
      eamThirdMaintenanceOrderDetailService.removeById(id);
      return Result.OK("删除成功!");
   }
	
   /**
    * 批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "设备三级保养明细-批量删除")
   @ApiOperation(value="设备三级保养明细-批量删除", notes="设备三级保养明细-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.eamThirdMaintenanceOrderDetailService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功！");
   }
	
   /**
    * 通过id查询
    *
    * @param id
    * @return
    */
   @AutoLog(value = "设备三级保养明细-通过id查询")
   @ApiOperation(value="设备三级保养明细-通过id查询", notes="设备三级保养明细-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
      EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail = eamThirdMaintenanceOrderDetailService.getById(id);
      return Result.OK(eamThirdMaintenanceOrderDetail);
   }
    @Autowired
    private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;

  /**
   * 导出excel
   *
   * @param request
   * @param eamThirdMaintenanceOrderDetail
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
      return super.exportXls(request, eamThirdMaintenanceOrderDetail, EamThirdMaintenanceOrderDetail.class, "设备三级保养明细");
  }
    /**
     * 分页列表查询
     *
     * @param orderId
     * @param pageNo
     * @param pageSize
     * @return
     */
    @ApiOperation(value = "周保工单明细-分页列表查询", notes = "周保工单明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(@RequestParam("orderId") String orderId,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId);
        queryWrapper.orderByAsc(EamThirdMaintenanceOrderDetail::getItemCode);
        Page<EamThirdMaintenanceOrderDetail> page = new Page<>(pageNo, pageSize);
        IPage<EamThirdMaintenanceOrderDetail> pageList = eamThirdMaintenanceOrderDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

  /**
   * 通过excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamThirdMaintenanceOrderDetail.class);
  }
    /**
     * 一次加载
     *
     * @param orderId
     * @return
     */
    @ApiOperation(value = "周保工单明细-不分页列表查询", notes = "周保工单明细-不分页列表查询")
    @GetMapping(value = "/queryList")
    public Result<?> queryList(@RequestParam("orderId") String orderId) {
        LambdaQueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId);
        queryWrapper.orderByAsc(EamThirdMaintenanceOrderDetail::getItemCode);
        List<EamThirdMaintenanceOrderDetail> list = eamThirdMaintenanceOrderDetailService.list(queryWrapper);
        return Result.OK(list);
    }

    /**
     * 报表使用 qsw
     * 2025-6-19
     */
    @GetMapping("/findExceptionDescriptionAll")
    public JSONObject findInspectionUser(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                         @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
                                         @RequestParam Map<String, Object> params) {

        String orderId = (String)params.get("id");

        List<EamThirdMaintenanceOrderDetail> details = new ArrayList<>();
        List<EamThirdMaintenanceOrderDetail> list = eamThirdMaintenanceOrderDetailService.lambdaQuery()
                .eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId)
                .eq(EamThirdMaintenanceOrderDetail::getMaintenanceResult, "2")
                .list();
        EamThirdMaintenanceOrderDetail detail = new EamThirdMaintenanceOrderDetail();

        StringBuilder sb = new StringBuilder();
        int index = 1;
        for (EamThirdMaintenanceOrderDetail item : list) {
            String value = item.getExceptionDescription();
            if (value != null && !value.isEmpty()) { // 跳过null和空字符串
                sb.append(index).append(". ").append(value).append(System.lineSeparator());
                index++;
            }
        }
        // 移除最后一个多余的换行符（可选）
        if (sb.length() > 0) {
            sb.setLength(sb.length() - System.lineSeparator().length());
        }

        String s = sb.toString();
        detail.setExceptionDescription(s);
        details.add(detail);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("data",details);
        return jsonObject;
    }
}