qushaowei
2025-06-19 3b518f3909a196d53e890823ee89d04f5f1b622a
点检、二保、三保打印
已添加1个文件
已修改7个文件
557 ■■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/InspectionVo.java 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java 277 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/InspectionVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
package org.jeecg.modules.eam.vo;
import lombok.Data;
@Data
public class InspectionVo {
    private String seq;
    private String operator;//操作
    private String confirmUser;//巡查
    private String inspectionContent;
    private String dayTime;
    private String inspectionResult;
    private String day1;
    private String day2;
    private String day3;
    private String day4;
    private String day5;
    private String day6;
    private String day7;
    private String day8;
    private String day9;
    private String day10;
    private String day11;
    private String day12;
    private String day13;
    private String day14;
    private String day15;
    private String day16;
    private String day17;
    private String day18;
    private String day19;
    private String day20;
    private String day21;
    private String day22;
    private String day23;
    private String day24;
    private String day25;
    private String day26;
    private String day27;
    private String day28;
    private String day29;
    private String day30;
    private String day31;
    private String confirmUser1;
    private String confirmUser2;
    private String confirmUser3;
    private String confirmUser4;
    private String confirmUser5;
    private String confirmUser6;
    private String confirmUser7;
    private String confirmUser8;
    private String confirmUser9;
    private String confirmUser10;
    private String confirmUser11;
    private String confirmUser12;
    private String confirmUser13;
    private String confirmUser14;
    private String confirmUser15;
    private String confirmUser16;
    private String confirmUser17;
    private String confirmUser18;
    private String confirmUser19;
    private String confirmUser20;
    private String confirmUser21;
    private String confirmUser22;
    private String confirmUser23;
    private String confirmUser24;
    private String confirmUser25;
    private String confirmUser26;
    private String confirmUser27;
    private String confirmUser28;
    private String confirmUser29;
    private String confirmUser30;
    private String confirmUser31;
    private String operator1;
    private String operator2;
    private String operator3;
    private String operator4;
    private String operator5;
    private String operator6;
    private String operator7;
    private String operator8;
    private String operator9;
    private String operator10;
    private String operator11;
    private String operator12;
    private String operator13;
    private String operator14;
    private String operator15;
    private String operator16;
    private String operator17;
    private String operator18;
    private String operator19;
    private String operator20;
    private String operator21;
    private String operator22;
    private String operator23;
    private String operator24;
    private String operator25;
    private String operator26;
    private String operator27;
    private String operator28;
    private String operator29;
    private String operator30;
    private String operator31;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -24,6 +24,7 @@
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;
@@ -32,8 +33,10 @@
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: ç‚¹æ£€å·¥å•
@@ -328,4 +331,278 @@
        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;
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.eam.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,13 +12,16 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderDetailService;
import org.jeecg.modules.eam.vo.InspectionVo;
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: è®¾å¤‡äºŒçº§ä¿å…»æ˜Žç»†
@@ -68,4 +73,44 @@
        List<EamSecondMaintenanceOrderDetail> list = eamSecondMaintenanceOrderDetailService.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<EamSecondMaintenanceOrderDetail> details = new ArrayList<>();
        List<EamSecondMaintenanceOrderDetail> list = eamSecondMaintenanceOrderDetailService.lambdaQuery()
                .eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId)
                .eq(EamSecondMaintenanceOrderDetail::getMaintenanceResult, "2")
                .list();
        EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
        StringBuilder sb = new StringBuilder();
        int index = 1;
        for (EamSecondMaintenanceOrderDetail 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;
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
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;
@@ -8,6 +9,7 @@
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;
@@ -16,7 +18,9 @@
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: è®¾å¤‡ä¸‰çº§ä¿å…»æ˜Žç»†
@@ -68,4 +72,44 @@
        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;
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
@@ -8,6 +8,10 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.vo.InspectionVo;
import java.util.List;
import java.util.Map;
/**
 * @Description: ç‚¹æ£€å·¥å•
@@ -24,4 +28,12 @@
     * @return
     */
    IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, @Param(Constants.WRAPPER) QueryWrapper<EamInspectionOrder> queryWrapper);
    /**
     * ç‚¹æ£€æŠ¥è¡¨ new
     */
    List<InspectionVo> findInspectionResult(@Param("equipmentId")String equipmentId, @Param("itemDemand")String itemDemand,@Param("yearMonth")String yearMonth);
    List<InspectionVo> findInspectionUser(@Param("equipmentId")String equipmentId,@Param("yearMonth")String yearMonth);
    List<Map<String,Object>> findInspectionStandard(@Param("equipmentId")String equipmentId);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -9,4 +9,46 @@
        on wmo.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>
    <select id="findInspectionUser"  parameterType="String" resultType="org.jeecg.modules.eam.vo.InspectionVo">
        SELECT
            t1.operator,
            t1.confirm_user as confirmUser,
            CONVERT(VARCHAR, DATEPART(DAY, t1.inspection_date)) as dayTime
        FROM
            eam_inspection_order t1
        WHERE t1.del_flag = '0'
          AND t1.equipment_id = #{equipmentId}
        AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.inspection_date, 120 ), 1, 7 ) = SUBSTRING(CONVERT(VARCHAR(10),#{yearMonth}, 120 ), 1, 7 )
    </select>
    <select id="findInspectionResult"  parameterType="String" resultType="org.jeecg.modules.eam.vo.InspectionVo">
        SELECT
            t1.item_demand as inspectionContent,
            CONVERT(VARCHAR, DATEPART(DAY, t2.inspection_date)) as dayTime,
            case t1.inspection_result  when '1' then '√' when '2' then 'x' else '' end as inspectionResult
        FROM
            eam_inspection_order_detail t1
        LEFT JOIN eam_inspection_order t2 ON t1.order_id = t2.id
        WHERE t1.item_demand = #{itemDemand}
        and t2.equipment_id = #{equipmentId}
        AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.inspection_date, 120 ), 1, 7 ) = SUBSTRING(CONVERT(VARCHAR(10),#{yearMonth}, 120 ), 1, 7 )
    </select>
    <select id="findInspectionStandard"  parameterType="String" resultType="Map">
        SELECT
            ROW_NUMBER() OVER (ORDER BY t1.id) AS seq,
            t1.item_demand as itemDemand
        FROM
            eam_maintenance_standard_detail t1
            LEFT JOIN eam_maintenance_standard t2 ON t1.standard_id = t2.id
        WHERE
          t2.maintenance_category = 'POINT_INSPECTION'
          AND t2.standard_status = 'NORMAL'
          and equipment_id =#{equipmentId}
        ORDER BY
            item_code ASC
    </select>
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -7,8 +7,10 @@
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.vo.InspectionVo;
import java.util.List;
import java.util.Map;
/**
 * @Description: ç‚¹æ£€å·¥å•
@@ -82,4 +84,13 @@
     * @return
     */
    List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate);
    /**
     * ç‚¹æ£€æŠ¥è¡¨ new
     */
    List<InspectionVo> findInspectionResult(String equipmentId, String itemDemand,String yearMonth);
    List<InspectionVo> findInspectionUser(String equipmentId,String yearMonth);
    List<Map<String,Object>> findInspectionStandard(String equipmentId);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -35,6 +35,7 @@
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -540,4 +541,19 @@
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
    @Override
    public List<InspectionVo> findInspectionResult(String equipmentId,String itemDemand,String yearMonth) {
        return this.baseMapper.findInspectionResult(equipmentId,itemDemand,yearMonth);
    }
    @Override
    public List<InspectionVo> findInspectionUser(String equipmentId,String yearMonth) {
        return this.baseMapper.findInspectionUser(equipmentId,yearMonth);
    }
    @Override
    public List<Map<String, Object>> findInspectionStandard(String equipmentId) {
        return this.baseMapper.findInspectionStandard(equipmentId);
    }
}