工控网新分支
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
hyingbo
11 小时以前 34eb84feb716412afd4229a83d4afbb204d5d6bc 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java


@@ -1,44 +1,31 @@


package org.jeecg.modules.eam.controller;




import java.util.*;


import java.util.stream.Collectors;


import java.io.IOException;


import java.io.UnsupportedEncodingException;


import java.net.URLDecoder;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;




import cn.hutool.core.collection.CollectionUtil;


import org.apache.shiro.authz.annotation.RequiresPermissions;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.extern.slf4j.Slf4j;


import org.apache.shiro.SecurityUtils;


import org.jeecg.common.api.vo.Result;


import org.jeecg.common.system.query.QueryGenerator;


import org.jeecg.common.util.oConvertUtils;


import org.jeecg.common.aspect.annotation.AutoLog;


import org.jeecg.common.system.base.controller.JeecgController;


import org.jeecg.common.system.vo.LoginUser;


import org.jeecg.modules.eam.constant.MajorPartialRepairStatusEnum;


import org.jeecg.modules.eam.entity.EamMajorPartialRepair;


import org.jeecg.modules.eam.entity.EamMajorPartialRepairDetail;


import org.jeecg.modules.eam.request.EamMajorPartialRepairQuery;


import org.jeecg.modules.eam.service.IEamMajorPartialRepairService;




import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import lombok.extern.slf4j.Slf4j;




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.jeecg.common.system.base.controller.JeecgController;


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 org.jeecg.common.aspect.annotation.AutoLog;




import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


import java.util.Objects;




 /**


 * @Description: eam_major_partial_repair


@@ -145,6 +132,10 @@


   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair:confirm")


   @GetMapping(value = "/confirm")


   public Result<String> confirm(@RequestParam("id") String id) {




      //获取当前登录人


      LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();




      EamMajorPartialRepair majorPartialRepair = eamMajorPartialRepairService.getById(id);


      if (Objects.isNull(majorPartialRepair)) {


         return Result.error("要确认的维修单不存在，请刷新重试！");


@@ -153,6 +144,7 @@


         return Result.error("该状态的维修单不能确认！");


      }


      majorPartialRepair.setRepairStatus(MajorPartialRepairStatusEnum.CONFIRMED.name());


      majorPartialRepair.setResponsiblePerson(user.getUsername());


      majorPartialRepair.setActualStartTime(new Date());


      eamMajorPartialRepairService.updateById(majorPartialRepair);


      return Result.OK("确认成功!");


@@ -163,12 +155,17 @@


   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair:confirm")


   @GetMapping(value = "/confirmBatch")


   public Result<String> confirmBatch(@RequestParam(name="ids") String ids) {




      //获取当前登录人


      LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();




      List<String> idList = Arrays.asList(ids.split(","));


      List<EamMajorPartialRepair> confirmList = CollectionUtil.newArrayList();


      idList.forEach(id -> {


         EamMajorPartialRepair majorPartialRepair = eamMajorPartialRepairService.getById(id);


         if (Objects.nonNull(majorPartialRepair) && MajorPartialRepairStatusEnum.PENDING_CONFIRMATION.name().equals(majorPartialRepair.getRepairStatus())) {


            majorPartialRepair.setRepairStatus(MajorPartialRepairStatusEnum.CONFIRMED.name());


            majorPartialRepair.setResponsiblePerson(user.getUsername());


            majorPartialRepair.setActualStartTime(new Date());


            confirmList.add(majorPartialRepair);


         }