Merge remote-tracking branch 'origin/master'

lyh

2025-07-10 736003d4534e1686b3e9ee27f7baa2afba7ad959

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

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,10 +16,12 @@
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.InspectionItemCategroyEnum;
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.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -27,16 +30,13 @@
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.annotation.Resource;
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;
import java.util.*;

/**
 * @Description: 点检工单
@@ -49,15 +49,16 @@
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
    @Autowired

    @Resource
    private IEamInspectionOrderService eamInspectionOrderService;
    @Autowired
    @Resource
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    @Resource
    private ObjectMapper objectMapper;
    @Autowired
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;
    @Autowired
    @Resource
    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;

    /**
@@ -69,14 +70,12 @@
     * @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);
@@ -109,8 +108,7 @@
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
        eamInspectionOrderRequest.setOrderNum(codeSeq);
        eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
        eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
        return Result.OK("添加成功！");
        return eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
    }

    /**
@@ -282,7 +280,6 @@
     * @param id
     * @return
     */
    //@AutoLog(value = "点检工单-通过id查询")
    @ApiOperation(value = "点检工单-通过id查询", notes = "点检工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -300,6 +297,7 @@
            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");
            translateDictTextUtils.translateField("equipmentCode", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
@@ -332,277 +330,63 @@
    }

    /**
     * 报表使用 qsw
     * 2025-6-19
     * 导出获取基本信息
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期
     * @return
     */
    @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;
    @GetMapping("/exportInsOrderBaseInfo")
    public JSONObject exportInspectionOrderBaseInfo(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderBaseInfo(equipmentCode, inspectionDate);
    }

    /**
     * 报表使用 qsw
     * 2025-6-19
     * 日点检项列表
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期
     * @return
     */
    @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;
    @GetMapping("/exportInsOrderDetailList")
    public JSONObject exportInspectionOrderDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderDetailList(equipmentCode, inspectionDate);
    }

    /**
     * 日点检责任人列表
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期
     * @return
     */
    @GetMapping("/exportInsOrderDetailUserList")
    public JSONObject exportInspectionOrderDetailUserList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderDetailUserList(equipmentCode, inspectionDate);
    }

    /**
     * 周点检项列表
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期
     * @return
     */
    @GetMapping("/exportWeekInsDetailList")
    public JSONObject exportWeekInsDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
        return eamInspectionOrderService.exportWeekInsDetailList(equipmentCode, inspectionDate);
    }

    /**
     * 周点检责任人列表
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期
     * @return
     */
    @GetMapping("/exportWeekInsOrderDetailUserList")
    public JSONObject exportInspectionOrder(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
        return eamInspectionOrderService.exportWeekInsOrderDetailUserList(equipmentCode, inspectionDate);
    }

}