¶Ô±ÈÐÂÎļþ |
| | |
| | | package org.jeecg.modules.eam.controller; |
| | | |
| | | import cn.hutool.core.collection.CollectionUtil; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.alibaba.fastjson.parser.Feature; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.fasterxml.jackson.core.JsonProcessingException; |
| | | import com.fasterxml.jackson.databind.ObjectMapper; |
| | | 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.aspect.annotation.AutoLog; |
| | | import org.jeecg.common.system.base.controller.JeecgController; |
| | | import org.jeecg.common.util.TranslateDictTextUtils; |
| | | import org.jeecg.modules.eam.constant.BusinessCodeConst; |
| | | import org.jeecg.modules.eam.constant.InspectionStatus; |
| | | import org.jeecg.modules.eam.constant.OrderCreationMethodEnum; |
| | | import org.jeecg.modules.eam.entity.EamInspectionOrder; |
| | | import org.jeecg.modules.eam.entity.EamInspectionOrderDetail; |
| | | import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest; |
| | | import org.jeecg.modules.eam.request.EamInspectionOrderQuery; |
| | | import org.jeecg.modules.eam.request.EamInspectionOrderRequest; |
| | | import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService; |
| | | import org.jeecg.modules.eam.service.IEamInspectionOrderService; |
| | | import org.jeecg.modules.eam.vo.InspectionVo; |
| | | import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo; |
| | | import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | import org.springframework.web.servlet.ModelAndView; |
| | | |
| | | import javax.servlet.http.HttpServletRequest; |
| | | import javax.servlet.http.HttpServletResponse; |
| | | import java.util.ArrayList; |
| | | import java.util.Arrays; |
| | | import java.util.List; |
| | | import java.util.Map; |
| | | |
| | | /** |
| | | * @Description: ç¹æ£å·¥å |
| | | * @Author: jeecg-boot |
| | | * @Date: 2025-04-02 |
| | | * @Version: V1.0 |
| | | */ |
| | | @Api(tags = "ç¹æ£å·¥å") |
| | | @RestController |
| | | @RequestMapping("/eam/eamInspectionOrder") |
| | | @Slf4j |
| | | public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> { |
| | | @Autowired |
| | | private IEamInspectionOrderService eamInspectionOrderService; |
| | | @Autowired |
| | | private ISysBusinessCodeRuleService businessCodeRuleService; |
| | | @Autowired |
| | | private ObjectMapper objectMapper; |
| | | @Autowired |
| | | private TranslateDictTextUtils translateDictTextUtils; |
| | | @Autowired |
| | | private IEamInspectionOrderDetailService eamInspectionOrderDetailService; |
| | | |
| | | /** |
| | | * å页å表æ¥è¯¢ |
| | | * |
| | | * @param query |
| | | * @param pageNo |
| | | * @param pageSize |
| | | * @param req |
| | | * @return |
| | | */ |
| | | //@AutoLog(value = "ç¹æ£å·¥å-å页å表æ¥è¯¢") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-å页å表æ¥è¯¢", notes = "ç¹æ£å·¥å-å页å表æ¥è¯¢") |
| | | @GetMapping(value = "/list") |
| | | public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query, |
| | | @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
| | | @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
| | | HttpServletRequest req) { |
| | | // QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap()); |
| | | Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize); |
| | | IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query); |
| | | return Result.OK(pageList); |
| | | } |
| | | |
| | | /** |
| | | * æ¥è¯¢ç¹æ£å·¥ååºæ¬ä¿¡æ¯ |
| | | * |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "æ¥è¯¢ç¹æ£å·¥ååºæ¬ä¿¡æ¯", notes = "æ¥è¯¢ç¹æ£å·¥ååºæ¬ä¿¡æ¯") |
| | | @GetMapping(value = "/selectVoById") |
| | | public Result<?> selectVoById(@RequestParam(name = "id") String id) { |
| | | return eamInspectionOrderService.selectVoById(id); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * æ·»å |
| | | * |
| | | * @param eamInspectionOrderRequest |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-æ·»å ") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-æ·»å ", notes = "ç¹æ£å·¥å-æ·»å ") |
| | | //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:add") |
| | | @PostMapping(value = "/add") |
| | | public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) { |
| | | String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE); |
| | | eamInspectionOrderRequest.setOrderNum(codeSeq); |
| | | eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL)); |
| | | eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest); |
| | | return Result.OK("æ·»å æåï¼"); |
| | | } |
| | | |
| | | /** |
| | | * ç¼è¾ |
| | | * |
| | | * @param eamInspectionOrderRequest |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-ç¼è¾") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-ç¼è¾", notes = "ç¹æ£å·¥å-ç¼è¾") |
| | | //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:edit") |
| | | @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) |
| | | public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) { |
| | | eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest); |
| | | return Result.OK("ç¼è¾æå!"); |
| | | } |
| | | |
| | | /** |
| | | * é¢åç¹æ£å·¥å |
| | | * |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-é¢åç¹æ£å·¥å") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-é¢åç¹æ£å·¥å", notes = "ç¹æ£å·¥å-é¢åç¹æ£å·¥å") |
| | | @GetMapping(value = "/receiveInspectionOrder") |
| | | public Result<String> receiveInspectionOrder(@RequestParam(name = "id") String id) { |
| | | eamInspectionOrderService.takeInspectionOrder(id); |
| | | return Result.OK("é¢åæå"); |
| | | } |
| | | |
| | | /** |
| | | * ä½åºç¹æ£å·¥å |
| | | * |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-ä½åºç¹æ£å·¥å") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-ä½åºç¹æ£å·¥å", notes = "ç¹æ£å·¥å-ä½åºç¹æ£å·¥å") |
| | | @GetMapping(value = "/cancelInspectionOrder") |
| | | public Result<String> cancelInspectionOrder(@RequestParam(name = "id") String id) { |
| | | eamInspectionOrderService.cancelInspectionOrder(id); |
| | | return Result.OK("ä½åºæå"); |
| | | } |
| | | |
| | | /** |
| | | * æ¹éä½åºä¸é¢å |
| | | * |
| | | * @param ids |
| | | * @param type |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-æ¹éä½åºä¸é¢å") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-æ¹éä½åºä¸é¢å", notes = "ç¹æ£å·¥å-æ¹éä½åºä¸é¢å") |
| | | @GetMapping(value = "/cancelOrReceive") |
| | | public Result<?> cancelOrReceive(@RequestParam(name = "ids") String ids, @RequestParam(name = "type") String type) { |
| | | return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type); |
| | | } |
| | | |
| | | /** |
| | | * ç¹æ£æµç¨ |
| | | * |
| | | * @param eamInspectionOrderRequest |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£æµç¨") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-ç¹æ£æµç¨", notes = "ç¹æ£å·¥å-ç¹æ£æµç¨") |
| | | @PostMapping("/approval") |
| | | public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) { |
| | | eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest); |
| | | return Result.OK("æä½æå"); |
| | | } |
| | | |
| | | @ApiOperation(value = "ç¹æ£å·¥å-æ¹éå®¡æ¹æµç¨", notes = "ç¹æ£å·¥å-æ¹éå®¡æ¹æµç¨") |
| | | @PostMapping("/batchApproval") |
| | | public Result<?> batchApproval(@RequestBody EamInspectionBatchApprovalRequest request) { |
| | | if(request == null || CollectionUtil.isEmpty(request.getTaskList())) { |
| | | return Result.error("没æéè¦å®¡æ¹çæ°æ®ï¼"); |
| | | } |
| | | int n = 0; |
| | | StringBuilder errorMsg = new StringBuilder(); |
| | | List<WorkTaskDataVo> tastList = request.getTaskList(); |
| | | for(WorkTaskDataVo workTaskDataVo : tastList) { |
| | | EamInspectionOrderRequest orderRequest = new EamInspectionOrderRequest(); |
| | | EamInspectionOrder order = eamInspectionOrderService.getById(workTaskDataVo.getDataId()); |
| | | if(order == null) { |
| | | errorMsg.append("å·¥åIDï¼"); |
| | | errorMsg.append(workTaskDataVo.getDataId()); |
| | | errorMsg.append(",ä¸åå¨æå·²è¢«å é¤!\n"); |
| | | continue; |
| | | } |
| | | if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) { |
| | | errorMsg.append("å·¥åå·ï¼"); |
| | | errorMsg.append(order.getOrderNum()); |
| | | errorMsg.append(",ç¶ææ æ³æ¹é审æ¹!\n"); |
| | | continue; |
| | | } |
| | | List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId()); |
| | | try { |
| | | orderRequest.setId(order.getId()); |
| | | orderRequest.setEquipmentId(order.getEquipmentId()); |
| | | //审æ¹ä¿¡æ¯ |
| | | orderRequest.setConfirmComment(request.getConfirmComment()); |
| | | orderRequest.setConfirmDealType(request.getConfirmDealType()); |
| | | //ä»»å¡ä¿¡æ¯ |
| | | orderRequest.setDataId(workTaskDataVo.getDataId()); |
| | | orderRequest.setTaskId(workTaskDataVo.getId()); |
| | | orderRequest.setUserId(workTaskDataVo.getAssignee()); |
| | | orderRequest.setInstanceId(workTaskDataVo.getProcInstId()); |
| | | orderRequest.setValues(workTaskDataVo.getVariables()); |
| | | orderRequest.setTableDetailList(tableDetailList); |
| | | EamInspectionOrder result = eamInspectionOrderService.inspectionProcess(orderRequest); |
| | | if(result == null) { |
| | | errorMsg.append("å·¥åå·ï¼"); |
| | | errorMsg.append(order.getOrderNum()); |
| | | errorMsg.append(",审æ¹å¤±è´¥!\n"); |
| | | continue; |
| | | } |
| | | n++; |
| | | |
| | | } catch (Exception e) { |
| | | errorMsg.append("å·¥åå·ï¼"); |
| | | errorMsg.append(order.getOrderNum()); |
| | | errorMsg.append(",审æ¹å¤±è´¥,é误åå :"); |
| | | errorMsg.append(e.getMessage() + "\n"); |
| | | } |
| | | |
| | | } |
| | | if(n > 0) { |
| | | String message = "æå审æ¹éè¿" + n + "æ¡è®°å½ï¼\n" + errorMsg; |
| | | return Result.OK(message); |
| | | } |
| | | return Result.error(errorMsg.toString()); |
| | | } |
| | | |
| | | /** |
| | | * éè¿idå é¤ |
| | | * |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-éè¿idå é¤") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-éè¿idå é¤", notes = "ç¹æ£å·¥å-éè¿idå é¤") |
| | | //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:delete") |
| | | @DeleteMapping(value = "/delete") |
| | | public Result<String> delete(@RequestParam(name = "id", required = true) String id) { |
| | | eamInspectionOrderService.removeById(id); |
| | | return Result.OK("å 餿å!"); |
| | | } |
| | | |
| | | /** |
| | | * æ¹éå é¤ |
| | | * |
| | | * @param ids |
| | | * @return |
| | | */ |
| | | @AutoLog(value = "ç¹æ£å·¥å-æ¹éå é¤") |
| | | @ApiOperation(value = "ç¹æ£å·¥å-æ¹éå é¤", notes = "ç¹æ£å·¥å-æ¹éå é¤") |
| | | //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:deleteBatch") |
| | | @DeleteMapping(value = "/deleteBatch") |
| | | public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
| | | this.eamInspectionOrderService.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) { |
| | | EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id); |
| | | if (eamInspectionOrder == null) { |
| | | return Result.error("æªæ¾å°å¯¹åºæ°æ®"); |
| | | } |
| | | try { |
| | | String json = objectMapper.writeValueAsString(eamInspectionOrder); |
| | | JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); |
| | | translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username"); |
| | | translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id"); |
| | | translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username"); |
| | | translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method"); |
| | | translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status"); |
| | | translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username"); |
| | | translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected"); |
| | | return Result.OK(item); |
| | | } catch (JsonProcessingException e) { |
| | | return Result.error("æ°æ®è½¬è¯å¤±è´¥ï¼"); |
| | | } |
| | | } |
| | | |
| | | /** |
| | | * 导åºexcel |
| | | * |
| | | * @param request |
| | | * @param eamInspectionOrder |
| | | */ |
| | | //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:exportXls") |
| | | @RequestMapping(value = "/exportXls") |
| | | public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) { |
| | | return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "ç¹æ£å·¥å"); |
| | | } |
| | | |
| | | /** |
| | | * éè¿excel导å
¥æ°æ® |
| | | * |
| | | * @param request |
| | | * @param response |
| | | * @return |
| | | */ |
| | | //@RequiresPermissions("ç¹æ£å·¥å:importExcel") |
| | | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
| | | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
| | | return super.importExcel(request, response, EamInspectionOrder.class); |
| | | } |
| | | |
| | | /** |
| | | * æ¥è¡¨ä½¿ç¨ qsw |
| | | * 2025-6-19 |
| | | */ |
| | | @GetMapping("/findInspectionResult") |
| | | public JSONObject findInspectionResult(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
| | | @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, |
| | | @RequestParam Map<String, Object> params) { |
| | | |
| | | String equipmentId = (String)params.get("equipmentId"); |
| | | String inspectionDate = (String)params.get("inspectionDate"); |
| | | |
| | | List<InspectionVo> inspectionVos = new ArrayList<>(); |
| | | List<Map<String, Object>> inspectionStandard = eamInspectionOrderService.findInspectionStandard(equipmentId); |
| | | for (Map<String, Object> map : inspectionStandard) { |
| | | List<InspectionVo> dayInspectionResult = eamInspectionOrderService.findInspectionResult(equipmentId,(String)map.get("itemDemand"),inspectionDate); |
| | | InspectionVo inspectionVo = new InspectionVo(); |
| | | inspectionVo.setInspectionContent((String)map.get("itemDemand")); |
| | | Object seq = map.get("seq"); |
| | | inspectionVo.setSeq(seq.toString()); |
| | | for (InspectionVo vo : dayInspectionResult) { |
| | | if("1".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay1(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("2".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay2(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("3".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay3(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("4".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay4(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("5".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay5(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("6".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay6(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("7".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay7(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("8".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay8(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("9".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay9(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("10".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay10(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("11".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay11(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("12".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay12(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("13".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay13(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("14".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay14(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("15".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay15(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("16".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay16(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("17".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay17(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("18".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay18(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("19".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay19(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("20".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay20(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("21".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay21(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("22".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay22(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("23".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay23(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("24".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay24(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("25".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay25(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("26".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay26(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("27".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay27(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("28".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay28(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("29".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay29(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("30".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay30(vo.getInspectionResult()); |
| | | continue; |
| | | }else if("31".equals(vo.getDayTime())){ |
| | | inspectionVo.setDay31(vo.getInspectionResult()); |
| | | continue; |
| | | } |
| | | } |
| | | inspectionVos.add(inspectionVo); |
| | | } |
| | | JSONObject jsonObject = new JSONObject(); |
| | | jsonObject.put("data",inspectionVos); |
| | | return jsonObject; |
| | | } |
| | | |
| | | /** |
| | | * æ¥è¡¨ä½¿ç¨ qsw |
| | | * 2025-6-19 |
| | | */ |
| | | @GetMapping("/findInspectionUser") |
| | | public JSONObject findInspectionUser(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
| | | @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, |
| | | @RequestParam Map<String, Object> params) { |
| | | |
| | | String equipmentId = (String)params.get("equipmentId"); |
| | | String inspectionDate = (String)params.get("inspectionDate"); |
| | | |
| | | List<InspectionVo> inspectionVos = new ArrayList<>(); |
| | | List<InspectionVo> inspectionUser = eamInspectionOrderService.findInspectionUser(equipmentId,inspectionDate); |
| | | InspectionVo inspectionVo = new InspectionVo(); |
| | | for (InspectionVo vo : inspectionUser) { |
| | | if("1".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator1(vo.getOperator()); |
| | | inspectionVo.setConfirmUser1(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("2".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator2(vo.getOperator()); |
| | | inspectionVo.setConfirmUser2(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("3".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator3(vo.getOperator()); |
| | | inspectionVo.setConfirmUser3(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("4".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator4(vo.getOperator()); |
| | | inspectionVo.setConfirmUser4(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("5".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator5(vo.getOperator()); |
| | | inspectionVo.setConfirmUser5(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("6".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator6(vo.getOperator()); |
| | | inspectionVo.setConfirmUser6(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("7".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator7(vo.getOperator()); |
| | | inspectionVo.setConfirmUser7(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("8".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator8(vo.getOperator()); |
| | | inspectionVo.setConfirmUser8(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("9".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator9(vo.getOperator()); |
| | | inspectionVo.setConfirmUser9(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("10".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator10(vo.getOperator()); |
| | | inspectionVo.setConfirmUser10(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("11".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator11(vo.getOperator()); |
| | | inspectionVo.setConfirmUser11(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("12".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator12(vo.getOperator()); |
| | | inspectionVo.setConfirmUser12(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("13".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator13(vo.getOperator()); |
| | | inspectionVo.setConfirmUser13(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("14".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator14(vo.getOperator()); |
| | | inspectionVo.setConfirmUser14(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("15".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator15(vo.getOperator()); |
| | | inspectionVo.setConfirmUser15(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("16".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator16(vo.getOperator()); |
| | | inspectionVo.setConfirmUser16(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("17".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator17(vo.getOperator()); |
| | | inspectionVo.setConfirmUser17(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("18".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator18(vo.getOperator()); |
| | | inspectionVo.setConfirmUser18(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("19".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator19(vo.getOperator()); |
| | | inspectionVo.setConfirmUser19(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("20".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator20(vo.getOperator()); |
| | | inspectionVo.setConfirmUser20(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("21".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator21(vo.getOperator()); |
| | | inspectionVo.setConfirmUser21(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("22".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator22(vo.getOperator()); |
| | | inspectionVo.setConfirmUser22(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("23".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator23(vo.getOperator()); |
| | | inspectionVo.setConfirmUser23(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("24".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator24(vo.getOperator()); |
| | | inspectionVo.setConfirmUser24(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("25".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator25(vo.getOperator()); |
| | | inspectionVo.setConfirmUser25(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("26".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator26(vo.getOperator()); |
| | | inspectionVo.setConfirmUser26(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("27".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator27(vo.getOperator()); |
| | | inspectionVo.setConfirmUser27(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("28".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator28(vo.getOperator()); |
| | | inspectionVo.setConfirmUser28(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("29".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator29(vo.getOperator()); |
| | | inspectionVo.setConfirmUser29(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("30".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator30(vo.getOperator()); |
| | | inspectionVo.setConfirmUser30(vo.getConfirmUser()); |
| | | continue; |
| | | }else if("31".equals(vo.getDayTime())){ |
| | | inspectionVo.setOperator31(vo.getOperator()); |
| | | inspectionVo.setConfirmUser31(vo.getConfirmUser()); |
| | | continue; |
| | | } |
| | | } |
| | | inspectionVos.add(inspectionVo); |
| | | // } |
| | | JSONObject jsonObject = new JSONObject(); |
| | | jsonObject.put("data",inspectionVos); |
| | | return jsonObject; |
| | | } |
| | | |
| | | |
| | | |
| | | } |