保养问题修改

qushaowei

2023-10-17 deec8d86a5eee2fc9ec18f6749076ea20b9edc66

保养问题修改

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

@@ -104,6 +104,9 @@
    @Autowired
    private IPrecisionInspectionDetailService precisionInspectionDetailService;

    @Autowired
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;


    /**
     * åˆ†é¡µåˆ—表查询
@@ -125,7 +128,7 @@
    }

    /**
     * æ—¥å¸¸ä¿å…»å·¥å•
     * äºŒçº§ä¿å…»å·¥å•
     * qsw 2023-4-14
     */
    @GetMapping("getDailyMaintenanceOrderList")
@@ -204,6 +207,71 @@
        return Result.ok(dailyMaintenanceOrderList);
    }


    /**
     * ä¸‰çº§ä¿å…»å·¥å•
     * qsw 2023-4-14
     */
    @GetMapping("getDailyMaintenanceOrder3List")
    public Result<?> getDailyMaintenanceOrder3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrderList(pageNo, pageSize, params);
        List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            //统计工时定额
            BigDecimal workingHourQuota = new BigDecimal(0);
            for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
                if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
                    Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
                    BigDecimal workingHour = new BigDecimal(wh);
                    workingHourQuota = workingHourQuota.add(workingHour);
                }
            }
            record.put("workingHourQuota",workingHourQuota);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
            /**
             * å¤é€‰æ¡† ä¸å¯ç¼–辑
             */
           /* String status = (String) record.get("status");
            if ("5".equals(status)) {
                record.put("distable", false);
            } else {
                record.put("distable", true);
            }*/
            /**
             * ç»Ÿè®¡å®žé™…工时
             */
            QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
            actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
            actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
            Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
            BigDecimal actualQuantity = new BigDecimal(0);
            if (map != null) {
                actualQuantity = (BigDecimal) map.get("actualQuantity");
            }
            record.put("actualWorkingHourQuota", actualQuantity);

            /**
             *获取是否为炉类设备标记
             */
            String equipmentCategoryName = (String) record.get("equipmentCategoryName");
            if("炉类设备".equals(equipmentCategoryName)){
                record.put("isNotStoveCategoryFlag", true);
            }else{
                record.put("isNotStoveCategoryFlag", false);
            }

        }
        return Result.ok(dailyMaintenanceOrderList);
    }


    /**
     * æ·»åŠ 
     *
@@ -232,6 +300,7 @@
        dailyMaintenanceOrder.setCreateType("1");//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））
        dailyMaintenanceOrder.setStoveExemptStatus("0");//炉类设备豁免20项状态（0未确认，1维修室主任，2保养人员，3仪表工）
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -461,6 +530,49 @@
                finishTransferOrderService.removeById(finishTransferOrder);
            }

//            /**
//             * åˆ é™¤ç²¾åº¦ç®¡ç†è¡¨
//             */
//            List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
//                    .eq(PrecisionInspection::getMaintenanceOrderId, id)
//                    .eq(PrecisionInspection::getDelFlag,0)
//                    .eq(PrecisionInspection::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
//            for (PrecisionInspection precisionInspection : precisionInspectionList) {
//                List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
//                        .eq(PrecisionInspectionDetail::getPrecisionInspectionId, precisionInspection.getId())
//                        .eq(PrecisionInspectionDetail::getDelFlag,0)
//                        .list();
//                for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
//                    precisionInspectionDetailService.removeById(precisionInspectionDetail);
//                }
//                precisionInspectionService.removeById(precisionInspection);
//            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
                return Result.error("撤销失败!");
            }
        } else {
            return Result.error("仅限已完工状态撤销完成操作!");
        }
    }



    @RequestMapping(value = "/revocation3M", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> revocation3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        String status = maintenanceOrder.getStatus();
        if ("5".equals(status)) {
            maintenanceOrder.setActualEndTime(null);
            boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

            /**
             * åˆ é™¤ç²¾åº¦æ£€éªŒè¡¨
             */
            List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
                    .eq(PrecisionInspection::getMaintenanceOrderId, id)
                    .eq(PrecisionInspection::getDelFlag,0)
@@ -476,6 +588,16 @@
                precisionInspectionService.removeById(precisionInspection);
            }

            /**
             * åˆ é™¤ç‚‰ç±»æ£€æµ‹
             */
            List<MaintenanceStoveExempt> maintenanceStoveExempts = maintenanceStoveExemptService.lambdaQuery()
                    .eq(MaintenanceStoveExempt::getMaintenanceOrderId, id)
                    .eq(MaintenanceStoveExempt::getDelFlag, 0).list();
            for (MaintenanceStoveExempt maintenanceStoveExempt : maintenanceStoveExempts) {
                maintenanceStoveExemptService.removeById(maintenanceStoveExempt);
            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
@@ -485,6 +607,7 @@
            return Result.error("仅限已完工状态撤销完成操作!");
        }
    }


    /**
     *  ä¿å…»å·¥å•æ´¾å·¥ã€æ”¹æ´¾
@@ -517,7 +640,41 @@
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

//        this.createPrecisionInspection(maintenanceOrder);
//
//        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
        } else {
            return Result.ok("报工成功!");
        }
    }


    @RequestMapping(value = "/report3M", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
        finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
        finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
        finishTransferOrder.setOperateUser(userId);
        finishTransferOrder.setRepairUser(userId);
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        this.createPrecisionInspection(maintenanceOrder);

        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
@@ -549,6 +706,13 @@
        }
    }


    void createMaintenanceStoveExempt(DailyMaintenanceOrder dailyMaintenanceOrder){
        MaintenanceStoveExempt maintenanceStoveExempt = new MaintenanceStoveExempt();
        maintenanceStoveExempt.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
    }

    /**
     * æ—¥å¸¸ä¿å…»å·¥å• èŽ·å–设备台站已绑定的对象部门
     * qsw 2023-7-11
@@ -563,6 +727,7 @@
     * å®¡æ‰¹
     */
    @RequestMapping(value = "/approve", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> approve(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
@@ -596,4 +761,15 @@
        return Result.OK("审批成功!");
    }

    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
        equipmentService.updateById(equipment);

        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(equipment.getMaintenanceOrderId());
        dailyMaintenanceOrder.setStatus("8");
        dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
        return Result.OK("编辑成功!");
    }

}

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

@@ -96,7 +96,10 @@
    //@RequiresPermissions("org.jeecg.modules:mom_eam_daily_maintenance_order_detail:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail) {
        dailyMaintenanceOrderDetailService.updateById(dailyMaintenanceOrderDetail);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetail.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }
        return Result.OK("编辑成功!");
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,220 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IMaintenanceStoveExemptService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
 * @Description: mom_eam_maintenance_stove_exempt
 * @Author: jeecg-boot
 * @Date:   2023-10-17
 * @Version: V1.0
 */
@Api(tags="mom_eam_maintenance_stove_exempt")
@RestController
@RequestMapping("/eam/maintenanceStoveExempt")
@Slf4j
public class MaintenanceStoveExemptController extends JeecgController<MaintenanceStoveExempt, IMaintenanceStoveExemptService> {
    @Autowired
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;

     @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param maintenanceStoveExempt
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_maintenance_stove_exempt-分页列表查询")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-分页列表查询", notes="mom_eam_maintenance_stove_exempt-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<MaintenanceStoveExempt>> queryPageList(MaintenanceStoveExempt maintenanceStoveExempt,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<MaintenanceStoveExempt> queryWrapper = QueryGenerator.initQueryWrapper(maintenanceStoveExempt, req.getParameterMap());
        Page<MaintenanceStoveExempt> page = new Page<MaintenanceStoveExempt>(pageNo, pageSize);
        IPage<MaintenanceStoveExempt> pageList = maintenanceStoveExemptService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param maintenanceStoveExempt
     * @return
     */
    @AutoLog(value = "mom_eam_maintenance_stove_exempt-添加")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-添加", notes="mom_eam_maintenance_stove_exempt-添加")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_maintenance_stove_exempt:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody MaintenanceStoveExempt maintenanceStoveExempt) {
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param maintenanceStoveExempt
     * @return
     */
    @AutoLog(value = "mom_eam_maintenance_stove_exempt-编辑")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-编辑", notes="mom_eam_maintenance_stove_exempt-编辑")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_maintenance_stove_exempt:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody MaintenanceStoveExempt maintenanceStoveExempt) {
        maintenanceStoveExemptService.updateById(maintenanceStoveExempt);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_maintenance_stove_exempt-通过id删除")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-通过id删除", notes="mom_eam_maintenance_stove_exempt-通过id删除")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_maintenance_stove_exempt:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        maintenanceStoveExemptService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_maintenance_stove_exempt-批量删除")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-批量删除", notes="mom_eam_maintenance_stove_exempt-批量删除")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_maintenance_stove_exempt:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.maintenanceStoveExemptService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_eam_maintenance_stove_exempt-通过id查询")
    @ApiOperation(value="mom_eam_maintenance_stove_exempt-通过id查询", notes="mom_eam_maintenance_stove_exempt-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<MaintenanceStoveExempt> queryById(@RequestParam(name="id",required=true) String id) {
        MaintenanceStoveExempt maintenanceStoveExempt = maintenanceStoveExemptService.getById(id);
        if(maintenanceStoveExempt==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(maintenanceStoveExempt);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param maintenanceStoveExempt
    */
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_maintenance_stove_exempt:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MaintenanceStoveExempt maintenanceStoveExempt) {
        return super.exportXls(request, maintenanceStoveExempt, MaintenanceStoveExempt.class, "mom_eam_maintenance_stove_exempt");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("mom_eam_maintenance_stove_exempt:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MaintenanceStoveExempt.class);
    }


     @GetMapping("getStoveCategory")
     public Result<?> getStoveCategory(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
         List<Map<String, Object>> maintenanceStoveExemptList = maintenanceStoveExemptService.getMaintenanceStoveExemptList(maintenanceOrderId);
         return Result.ok(maintenanceStoveExemptList);
     }


     /**
      * æ¸©åº¦å‡åŒ€æ€§æ£€æµ‹æ¡ä»¶ç¡®è®¤è¡¨
      */
     @RequestMapping(value = "/maintenanceStoveExempt", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> maintenanceStoveExempt(@RequestBody MaintenanceStoveExempt maintenanceStoveExempt) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getId();

         MaintenanceStoveExempt stoveExempt = maintenanceStoveExemptService.getById(maintenanceStoveExempt.getId());
         DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(stoveExempt.getMaintenanceOrderId());
         String stoveExemptStatus = maintenanceOrder.getStoveExemptStatus();

         if ("0".equals(stoveExemptStatus)){
             maintenanceStoveExempt.setRepairDirectorUser(userId);
             maintenanceOrder.setStoveExemptStatus("1");
         }else if("1".equals(stoveExemptStatus)){
             maintenanceStoveExempt.setMaintenanceUser(userId);
             maintenanceOrder.setStoveExemptStatus("2");
         }else if("2".equals(stoveExemptStatus)){
             maintenanceStoveExempt.setMeterUser(userId);
             maintenanceOrder.setStoveExemptStatus("3");
         }

         dailyMaintenanceOrderService.updateById(maintenanceOrder);
         maintenanceStoveExemptService.updateById(maintenanceStoveExempt);
         return Result.OK("审批成功!");
     }

}

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

@@ -237,7 +237,7 @@
            preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());

            maintenanceOrder.setPrecisionInspectionStatus("5");
            maintenanceOrder.setStatus("8");
//            maintenanceOrder.setStatus("8");
        }

        preInspection.setRemark(precisionInspection.getRemark());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrderDetail.java

@@ -4,7 +4,10 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -77,4 +80,7 @@
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;

    @TableField(exist = false)
    private List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -365,4 +365,6 @@
    List<EquipmentSpares> equipmentSparesList;
    @TableField(exist = false)
    private String equipmentCategoryUda1;
    @TableField(exist = false)
    private String maintenanceOrderId;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStoveExempt.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
package org.jeecg.modules.eam.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: mom_eam_maintenance_stove_exempt
 * @Author: jeecg-boot
 * @Date:   2023-10-17
 * @Version: V1.0
 */
@Data
@TableName("mom_eam_maintenance_stove_exempt")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_maintenance_stove_exempt对象", description="mom_eam_maintenance_stove_exempt")
public class MaintenanceStoveExempt extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**3保工单id*/
    @Excel(name = "3保工单id", width = 15)
    @ApiModelProperty(value = "3保工单id")
    private java.lang.String maintenanceOrderId;
    /**维修室主任*/
    @Excel(name = "维修室主任", width = 15)
    @ApiModelProperty(value = "维修室主任")
    private java.lang.String repairDirectorUser;
    /**保养人员*/
    @Excel(name = "保养人员", width = 15)
    @ApiModelProperty(value = "保养人员")
    private java.lang.String maintenanceUser;
    /**仪表工*/
    @Excel(name = "仪表工", width = 15)
    @ApiModelProperty(value = "仪表工")
    private java.lang.String meterUser;
    /**问题项*/
    @Excel(name = "问题项", width = 15)
    @ApiModelProperty(value = "问题项")
    private java.lang.String sort;



    /**结果1*/
    @Excel(name = "结果1", width = 15)
    @ApiModelProperty(value = "结果1")
    private java.lang.String result_1;

    /**结果2*/
    @Excel(name = "结果2", width = 15)
    @ApiModelProperty(value = "结果2")
    private java.lang.String result_2;

    /**result3*/
    @Excel(name = "result3", width = 15)
    @ApiModelProperty(value = "result3")
    private java.lang.String result_3;
    /**result4*/
    @Excel(name = "result4", width = 15)
    @ApiModelProperty(value = "result4")
    private java.lang.String result_4;
    /**result5*/
    @Excel(name = "result5", width = 15)
    @ApiModelProperty(value = "result5")
    private java.lang.String result_5;
    /**result6*/
    @Excel(name = "result6", width = 15)
    @ApiModelProperty(value = "result6")
    private java.lang.String result_6;
    /**result7*/
    @Excel(name = "result7", width = 15)
    @ApiModelProperty(value = "result7")
    private java.lang.String result_7;
    /**result8*/
    @Excel(name = "result8", width = 15)
    @ApiModelProperty(value = "result8")
    private java.lang.String result_8;
    /**result9*/
    @Excel(name = "result9", width = 15)
    @ApiModelProperty(value = "result9")
    private java.lang.String result_9;
    /**result10*/
    @Excel(name = "result10", width = 15)
    @ApiModelProperty(value = "result10")
    private java.lang.String result_10;
    /**result11*/
    @Excel(name = "result11", width = 15)
    @ApiModelProperty(value = "result11")
    private java.lang.String result_11;
    /**result12*/
    @Excel(name = "result12", width = 15)
    @ApiModelProperty(value = "result12")
    private java.lang.String result_12;
    /**result13*/
    @Excel(name = "result13", width = 15)
    @ApiModelProperty(value = "result13")
    private java.lang.String result_13;
    /**result14*/
    @Excel(name = "result14", width = 15)
    @ApiModelProperty(value = "result14")
    private java.lang.String result_14;
    /**result15*/
    @Excel(name = "result15", width = 15)
    @ApiModelProperty(value = "result15")
    private java.lang.String result_15;
    /**result16*/
    @Excel(name = "result16", width = 15)
    @ApiModelProperty(value = "result16")
    private java.lang.String result_16;
    /**result17*/
    @Excel(name = "result17", width = 15)
    @ApiModelProperty(value = "result17")
    private java.lang.String result_17;
    /**result18*/
    @Excel(name = "result18", width = 15)
    @ApiModelProperty(value = "result18")
    private java.lang.String result_18;
    /**result19*/
    @Excel(name = "result19", width = 15)
    @ApiModelProperty(value = "result19")
    private java.lang.String result_19;
    /**result20*/
    @Excel(name = "result20", width = 15)
    @ApiModelProperty(value = "result20")
    private java.lang.String result_20;
    /**确认结果1*/
    @Excel(name = "确认结果1", width = 15)
    @ApiModelProperty(value = "确认结果1")
    private java.lang.String result_21;
    /**确认结果2*/
    @Excel(name = "确认结果2", width = 15)
    @ApiModelProperty(value = "确认结果2")
    private java.lang.String result_22;
    /**delFlag*/
    @Excel(name = "delFlag", width = 15)
    @ApiModelProperty(value = "delFlag")
    @TableLogic
    private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStoveExemptMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;
import java.util.Map;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.MaintenanceStoveExempt;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: mom_eam_maintenance_stove_exempt
 * @Author: jeecg-boot
 * @Date:   2023-10-17
 * @Version: V1.0
 */
public interface MaintenanceStoveExemptMapper extends BaseMapper<MaintenanceStoveExempt> {

    List<Map<String, Object>> getMaintenanceStoveExemptList(@Param("maintenanceOrderId")String maintenanceOrderId);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml

@@ -15,7 +15,8 @@
            t3.maintenance_tool as maintenanceTool,
            t3.maintenance_require as maintenanceRequire,
            concat(t6.code, '/', t6.name) as maintenanceCycleName,
            t5.name as maintenanceSpecialtyName
            t5.name as maintenanceSpecialtyName,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1
        FROM
            mom_eam_daily_maintenance_order_detail t1
        LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml

@@ -46,11 +46,18 @@
            t5.item_text as statusName,
            t1.num,
            t4.id as maintenanceCycleId,
            t4.maintenance_type as maintenanceType,
            t10.item_text as maintenanceTypeName,
            concat(t4.code, '/', t4.name) as maintenanceCycleName,
            t3.id as equipmentId,
            t3.num as equipmentNum,
            t3.name as equipmentName,
            t3.model as equipmentModel,
            t3.specification,
            t3.technology_status as technologyStatus,
            t3.precision_parameters as precisionParameters,
            t11.id as equipmentCategoryId,
            t11.name as equipmentCategoryName,
            t2.id as maintenanceStandardId,
            t2.num as maintenanceStandardNum,
            t2.assign_mode assignMode,
@@ -70,18 +77,22 @@
            t1.create_by as createBy,
            t1.create_time as createTime,
            t1.remark,
            t1.description
            t1.description,
            t1.precision_inspection_status as precisionInspectionStatus,
            t1.stove_exempt_status as stoveExemptStatus
        FROM
            mom_eam_daily_maintenance_order t1
        LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
        left join mom_eam_equipment t3 on t1.equipment_id = t3.id
        left join mom_eam_equipment_category t11 on t3.equipment_category_id = t11.id
        left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
        left join sys_depart t6 on t3.use_id = t6.id
        left join mom_base_team t7 on t7.id = t3.team_id
        left join sys_user t8 on t1.maintenance_user_id = t8.id
        left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0
        left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStoveExemptMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.MaintenanceStoveExemptMapper">

    <select id="getMaintenanceStoveExemptList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id as id,
            t1.sort,
            t2.realname as repairDirectorUserName,
            t3.realname as maintenanceUserName,
            t4.realname as meterUserName,
            ISNULL( t1.result_1, 0 ) AS result_1,
            ISNULL( t1.result_2, 0 ) AS result_2,
            ISNULL( t1.result_3, 0 ) AS result_3,
            ISNULL( t1.result_4, 0 ) AS result_4,
            ISNULL( t1.result_5, 0 ) AS result_5,
            ISNULL( t1.result_6, 0 ) AS result_6,
            ISNULL( t1.result_7, 0 ) AS result_7,
            ISNULL( t1.result_8, 0 ) AS result_8,
            ISNULL( t1.result_9, 0 ) AS result_9,
            ISNULL( t1.result_10, 0 ) AS result_10,
            ISNULL( t1.result_11, 0 ) AS result_11,
            ISNULL( t1.result_12, 0 ) AS result_12,
            ISNULL( t1.result_13, 0 ) AS result_13,
            ISNULL( t1.result_14, 0 ) AS result_14,
            ISNULL( t1.result_15, 0 ) AS result_15,
            ISNULL( t1.result_16, 0 ) AS result_16,
            ISNULL( t1.result_17, 0 ) AS result_17,
            ISNULL( t1.result_18, 0 ) AS result_18,
            ISNULL( t1.result_19, 0 ) AS result_19,
            ISNULL( t1.result_20, 0 ) AS result_20,
            ISNULL( t1.result_21, 0 ) AS result_21,
            ISNULL( t1.result_22, 0 ) AS result_22,
            t1.update_time as updateTime
        FROM
            mom_eam_maintenance_stove_exempt t1
        LEFT JOIN sys_user t2 ON t1.repair_director_user = t2.id
        LEFT JOIN sys_user t3 ON t1.maintenance_user = t3.id
        LEFT JOIN sys_user t4 ON t1.meter_user = t4.id
        where t1.del_flag = '0' and t1.maintenance_order_id = #{maintenanceOrderId}
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStoveExemptService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.MaintenanceStoveExempt;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
 * @Description: mom_eam_maintenance_stove_exempt
 * @Author: jeecg-boot
 * @Date:   2023-10-17
 * @Version: V1.0
 */
public interface IMaintenanceStoveExemptService extends IService<MaintenanceStoveExempt> {

    List<Map<String, Object>> getMaintenanceStoveExemptList(String maintenanceOrderId);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStoveExemptServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package org.jeecg.modules.eam.service.impl;

import org.jeecg.modules.eam.entity.MaintenanceStoveExempt;
import org.jeecg.modules.eam.mapper.MaintenanceStoveExemptMapper;
import org.jeecg.modules.eam.service.IMaintenanceStoveExemptService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.List;
import java.util.Map;

/**
 * @Description: mom_eam_maintenance_stove_exempt
 * @Author: jeecg-boot
 * @Date:   2023-10-17
 * @Version: V1.0
 */
@Service
public class MaintenanceStoveExemptServiceImpl extends ServiceImpl<MaintenanceStoveExemptMapper, MaintenanceStoveExempt> implements IMaintenanceStoveExemptService {

    @Override
    public List<Map<String, Object>> getMaintenanceStoveExemptList(String maintenanceOrderId) {
        return this.baseMapper.getMaintenanceStoveExemptList(maintenanceOrderId);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -87,6 +87,12 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**使用部门编码*/
    private String useDepartNum;

    /**维修部门编码*/
    private String repairDepartNum;

    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids
    /**部门负责人的ids*/
    @TableField(exist = false)
@@ -130,6 +136,8 @@
                Objects.equals(createBy, depart.createBy) &&
                Objects.equals(createTime, depart.createTime) &&
                Objects.equals(updateBy, depart.updateBy) &&
                Objects.equals(useDepartNum, depart.useDepartNum) &&
                Objects.equals(repairDepartNum, depart.repairDepartNum) &&
                Objects.equals(updateTime, depart.updateTime);
    }

@@ -142,6 +150,6 @@
        return Objects.hash(super.hashCode(), id, parentId, departName, 
                departNameEn, departNameAbbr, departOrder, description,orgCategory, 
                orgType, orgCode, mobile, fax, address, memo, status, 
                delFlag, createBy, createTime, updateBy, updateTime);
                delFlag, createBy, createTime, updateBy, updateTime,useDepartNum,repairDepartNum);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -75,6 +75,12 @@

    private Date updateTime;

    /**使用部门编码*/
    private String useDepartNum;

    /**维修部门编码*/
    private String repairDepartNum;

    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段部门负责人ids
    /**部门负责人ids*/
    private String directorUserIds;
@@ -113,6 +119,8 @@
        this.updateBy = sysDepart.getUpdateBy();
        this.updateTime = sysDepart.getUpdateTime();
        this.directorUserIds = sysDepart.getDirectorUserIds();
        this.useDepartNum = sysDepart.getUseDepartNum();
        this.repairDepartNum = sysDepart.getRepairDepartNum();
    }

    public boolean getIsLeaf() {
@@ -346,6 +354,22 @@
        this.directorUserIds = directorUserIds;
    }

    public String getUseDepartNum() {
        return useDepartNum;
    }

    public void setUseDepartNum(String useDepartNum) {
        this.useDepartNum = useDepartNum;
    }

    public String getRepairDepartNum() {
        return repairDepartNum;
    }

    public void setRepairDepartNum(String repairDepartNum) {
        this.repairDepartNum = repairDepartNum;
    }

    /**
     * é‡å†™equals方法
     */
@@ -380,6 +404,8 @@
                Objects.equals(updateBy, model.updateBy) &&
                Objects.equals(updateTime, model.updateTime) &&
                Objects.equals(directorUserIds, model.directorUserIds) &&
                Objects.equals(useDepartNum, model.useDepartNum) &&
                Objects.equals(repairDepartNum, model.repairDepartNum) &&
                Objects.equals(children, model.children);
    }
    
@@ -392,7 +418,7 @@
        return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
                departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, 
                memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
                children,directorUserIds);
                children,directorUserIds,useDepartNum,repairDepartNum);
    }

}