From ac4d1a5962441156ff22a0c87f4eacc083daa9a6 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 20 六月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 681 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 564 insertions(+), 117 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 8c1431c..c5a3769 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -1,144 +1,317 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.system.query.QueryGenerator;
+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
+ * @Date: 2025-04-02
* @Version: V1.0
*/
-@Api(tags="鐐规宸ュ崟")
+@Api(tags = "鐐规宸ュ崟")
@RestController
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
- @Autowired
- private IEamInspectionOrderService eamInspectionOrderService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamInspectionOrder
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
- @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.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamInspectionOrder
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-娣诲姞")
- @ApiOperation(value="鐐规宸ュ崟-娣诲姞", notes="鐐规宸ュ崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody EamInspectionOrder eamInspectionOrder) {
- eamInspectionOrderService.save(eamInspectionOrder);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamInspectionOrder
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-缂栬緫")
- @ApiOperation(value="鐐规宸ュ崟-缂栬緫", notes="鐐规宸ュ崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody EamInspectionOrder eamInspectionOrder) {
- eamInspectionOrderService.updateById(eamInspectionOrder);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃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<EamInspectionOrder> queryById(@RequestParam(name="id",required=true) String id) {
- EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
- if(eamInspectionOrder==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(eamInspectionOrder);
- }
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamInspectionOrder
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @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) {
@@ -146,16 +319,290 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃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;
+ }
+
+
+
}
--
Gitblit v1.9.3