技术状态鉴定 批量点检驳回 审批

qushaowei

2023-12-12 707b5af9ed7c12d18cba597e3f2f76671891034b

技术状态鉴定 批量点检驳回 审批

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

@@ -25,6 +25,9 @@
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.CalibrationOrderPage;
import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -70,6 +73,15 @@

    @Autowired
    private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;

    @Autowired
    private ITechnologyStatusService technologyStatusService;

    @Autowired
    private ISysFileNameService sysFileNameService;

    @Autowired
    private ISysDepartService sysDepartService;
//    @Autowired
//    private IUploadRelaService uploadRelaService;
//    @Autowired
@@ -458,11 +470,15 @@
            String managementMode = record.getManagementMode();
            String equipmentId = record.getEquipmentId();
            Equipment equipment = equipmentService.getById(equipmentId);
            String useId = equipment.getUseId();
            SysDepart depart = sysDepartService.getById(useId);
            if(equipment != null){
                record.setEquipmentNum(equipment.getNum());
                record.setEquipmentName(equipment.getName());
                record.setEquipmentModel(equipment.getModel());
                record.setEquipmentSpecification(equipment.getSpecification());
                record.setEquipmentImportance(equipment.getEquipmentImportanceId());
                record.setUseDepartName(depart.getDepartName());
            }
//            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
//            record.setPrecisionParameterList(precisionParameterList);
@@ -503,7 +519,7 @@
        for (CalibrationOrderDetail calibrationOrderDetail : calibrationOrderDetails) {
            calibrationOrderDetailService.removeById(calibrationOrderDetail);
        }
        addAndEdit(calibrationOrder);
//        addAndEdit(calibrationOrder);
        return Result.OK("编辑成功!");
    }

@@ -532,10 +548,26 @@
    public Result<String> addNew(@RequestBody CalibrationOrder calibrationOrder) {
        calibrationOrder.setStatus("1");
        calibrationOrderService.save(calibrationOrder);
        addAndEdit(calibrationOrder);

        String equipmentId = calibrationOrder.getEquipmentId();
        Equipment equipment = equipmentService.getById(equipmentId);
        String equipmentImportance = equipment.getEquipmentImportanceId();
        if("D".equals(equipmentImportance)){
            this.createTechnologyStatus(calibrationOrder);
        }

//        addAndEdit(calibrationOrder);
        return Result.OK("添加成功！");
    }

    void createTechnologyStatus(CalibrationOrder calibrationOrder){
        List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9");
        TechnologyStatus technologyStatus = new TechnologyStatus();
        technologyStatus.setOrderId(calibrationOrder.getId());
        technologyStatus.setReceipts(sysFileName.get(0).getReceipts());
        technologyStatusService.save(technologyStatus);
    }

    /**
     * è®¾å¤‡æ£€å®šå·¥å• åˆ›å»ºæ—¶é€šè¿‡è®¾å¤‡èŽ·å–设备精度参数
     * qsw 2023-7-18

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

@@ -129,6 +129,7 @@
    public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandard.setAssignMode("1");
        dailyInspectionStandardService.save(dailyInspectionStandard);
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
        DailyInspectionStandardDetail isd = null;
@@ -557,4 +558,41 @@
            return Result.error("审核失败!");
        }
    }


    /**
     * æ‰¹é‡ ç­¾å®¡æµç¨‹
     * qsw 2023-12-12
     */
    @RequestMapping(value = "/auditApprovalBatch", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> auditApprovalBatch(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

        List<DailyInspectionStandard> dailyInspectionStandardlist = dailyInspectionStandard.getDailyInspectionStandardlist();
        for (DailyInspectionStandard inspectionStandard : dailyInspectionStandardlist) {
            String approvalStatus = inspectionStandard.getApprovalStatus();
            if("5".equals(approvalStatus)){//审核通过后，版本生效
                List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                        .eq(DailyInspectionStandard::getNum, inspectionStandard.getNum())
                        .eq(DailyInspectionStandard::getVersionStatus, "2").list();
                for (DailyInspectionStandard standard : dailyInspectionStandards) {
                    standard.setVersionStatus("3");
                    standard.setLoseEfficacyTime(new Date());
                    standard.setLoseEfficacyPerson(sysUser.getRealname());
                    dailyInspectionStandardService.updateById(standard);
                }
                inspectionStandard.setApprovalPerson(sysUser.getRealname());
                inspectionStandard.setVersionStatus("2");
                inspectionStandard.setTakeEffectTime(new Date());
            }else if("3".equals(approvalStatus)){
                inspectionStandard.setAuditPerson(sysUser.getRealname());
            }
            boolean b = dailyInspectionStandardService.updateById(inspectionStandard);
            if (!b){
                return Result.error("审核失败!");
            }
        }
        return Result.OK("审核成功!");
    }
}

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

@@ -111,6 +111,9 @@
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;

    @Autowired
    private ITechnologyStatusService technologyStatusService;

    @Autowired
    private ISysFileNameService sysFileNameService;

    @Resource
@@ -602,6 +605,16 @@
                maintenanceStoveExemptService.removeById(maintenanceStoveExempt);
            }

            /**
             * åˆ é™¤ç²¾åº¦æ£€éªŒå•
             */
            List<TechnologyStatus> technologyStatusList = technologyStatusService.lambdaQuery()
                    .eq(TechnologyStatus::getOrderId, id)
                    .eq(TechnologyStatus::getDelFlag, 0).list();
            for (TechnologyStatus technologyStatus : technologyStatusList) {
                technologyStatusService.removeById(technologyStatus);
            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
@@ -676,6 +689,13 @@
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        String equipmentId = maintenanceOrder.getEquipmentId();
        Equipment equipment = equipmentService.getById(equipmentId);
        String precisionParameters = equipment.getPrecisionParameters();
        if(!"1".equals(precisionParameters)){
            this.createTechnologyStatus(maintenanceOrder);
        }

        this.createPrecisionInspection(maintenanceOrder);

        this.createMaintenanceStoveExempt(maintenanceOrder);
@@ -719,6 +739,14 @@
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
    }

    void createTechnologyStatus(DailyMaintenanceOrder dailyMaintenanceOrder){
        List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9");
        TechnologyStatus technologyStatus = new TechnologyStatus();
        technologyStatus.setOrderId(dailyMaintenanceOrder.getId());
        technologyStatus.setReceipts(sysFileName.get(0).getReceipts());
        technologyStatusService.save(technologyStatus);
    }

    /**
     * æ—¥å¸¸ä¿å…»å·¥å• èŽ·å–设备台站已绑定的对象部门
     * qsw 2023-7-11

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

@@ -33,6 +33,7 @@
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
//import org.jeecg.modules.system.service.IUploadService;
import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;

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

@@ -136,7 +136,7 @@


    /**
     * æ—¥å¸¸ä¿å…»å·¥å•åˆ›å»º  ç»„件通过使用部门过滤获取保养标准
     * äºŒä¿  ç»„件通过使用部门过滤获取保养标准
     * qsw 2023-4-26
     */
    @GetMapping("getMaintenanceStandard2List")
@@ -145,6 +145,16 @@
        return Result.ok(maintenanceStandardList);
    }

    /**
     * ä¸‰ä¿  ç»„件通过使用部门过滤获取保养标准
     * qsw 2023-12-12
     */
    @GetMapping("getMaintenanceStandard3List")
    public Result<?> getMaintenanceStandard3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> maintenanceStandardList = maintenanceStandardService.getMaintenanceStandard3List(pageNo, pageSize, params);
        return Result.ok(maintenanceStandardList);
    }


    /**
     * æ·»åŠ 

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

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

import java.util.Arrays;
import java.util.Date;
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.naming.ldap.PagedResultsControl;
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.ICalibrationOrderService;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.ITechnologyStatusService;

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_technology_status
 * @Author: jeecg-boot
 * @Date:   2023-12-11
 * @Version: V1.0
 */
@Api(tags="mom_eam_technology_status")
@RestController
@RequestMapping("/eam/technologyStatus")
@Slf4j
public class TechnologyStatusController extends JeecgController<TechnologyStatus, ITechnologyStatusService> {
    @Autowired
    private ITechnologyStatusService technologyStatusService;

     @Autowired
     private IEamEquipmentService equipmentService;

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

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

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

     @GetMapping("getTechnologyStatus")
     public Result<?> getTechnologyStatus(@RequestParam(name = "orderId", required = true) String orderId) {
         List<Map<String, Object>> technologyStatusList = technologyStatusService.getTechnologyStatusList(orderId);
         return Result.ok(technologyStatusList);
     }


     /**
      * ä¸‰ä¿æ— ç²¾åº¦å‚æ•° ç”Ÿäº§è®¾å¤‡æŠ€æœ¯çŠ¶æ€é‰´å®šè¡¨
      */
     @RequestMapping(value = "/technologyStatusAuthenticate", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> technologyStatusAuthenticate(@RequestBody TechnologyStatus technologyStatus) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String realname = sysUser.getRealname();
         String flag = technologyStatus.getFlag();
         Equipment equipment = equipmentService.getById(technologyStatus.getEquipmentId());
         if("1".equals(flag)){//1管理员权限
             technologyStatus.setAppraiser(realname);
             technologyStatus.setLeadership(realname);

             equipment.setTechnologyStatus(technologyStatus.getTechnologyStatus());
         }else if("2".equals(flag)){//2检定人员签字权限
             technologyStatus.setAppraiser(realname);
         }else{//3领导签字权限
             technologyStatus.setLeadership(realname);

             equipment.setTechnologyStatus(technologyStatus.getTechnologyStatus());
         }
         technologyStatusService.updateById(technologyStatus);
         equipmentService.updateById(equipment);
         return Result.OK("确认成功!");
     }


     /**
      * D类设备 ç”Ÿäº§è®¾å¤‡æŠ€æœ¯çŠ¶æ€é‰´å®šè¡¨
      */
     @RequestMapping(value = "/technologyStatusAuthenticateD", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> technologyStatusAuthenticateD(@RequestBody TechnologyStatus technologyStatus) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String realname = sysUser.getRealname();
         String flag = technologyStatus.getFlag();
         Equipment equipment = equipmentService.getById(technologyStatus.getEquipmentId());
         CalibrationOrder calibrationOrder = calibrationOrderService.getById(technologyStatus.getOrderId());
         if("1".equals(flag)){//1管理员权限
             technologyStatus.setAppraiser(realname);
             technologyStatus.setLeadership(realname);

             equipment.setTechnologyStatus(technologyStatus.getTechnologyStatus());

             calibrationOrder.setCalibrationResult(technologyStatus.getTechnologyStatus());
             calibrationOrder.setCalibrationTime(new Date());
         }else if("2".equals(flag)){//2检定人员签字权限
             technologyStatus.setAppraiser(realname);
         }else{//3领导签字权限
             technologyStatus.setLeadership(realname);

             equipment.setTechnologyStatus(technologyStatus.getTechnologyStatus());

             calibrationOrder.setCalibrationResult(technologyStatus.getTechnologyStatus());
             calibrationOrder.setCalibrationTime(new Date());
         }
         technologyStatusService.updateById(technologyStatus);
         equipmentService.updateById(equipment);
         calibrationOrderService.updateById(calibrationOrder);
         return Result.OK("确认成功!");
     }

}

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

@@ -189,6 +189,14 @@
    private String equipmentSpecification;

    @TableField(exist = false)
    private String useDepartName;
    /**
     * ABC标识
     */
    @TableField(exist = false)
    private String equipmentImportance;

    @TableField(exist = false)
    private List<Map<String, Object>> precisionParameterList;
    /**
     * è®¾å¤‡åç§°

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

@@ -129,4 +129,7 @@
    @TableField(exist = false)
    private List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist;

    @TableField(exist = false)
    private List<DailyInspectionStandard> dailyInspectionStandardlist;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
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.*;
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_technology_status
 * @Author: jeecg-boot
 * @Date:   2023-12-11
 * @Version: V1.0
 */
@Data
@TableName("mom_eam_technology_status")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_technology_status对象", description="mom_eam_technology_status")
public class TechnologyStatus extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**三保单据/技术状态鉴定单据id*/
    @Excel(name = "三保单据/技术状态鉴定单据id", width = 15)
    @ApiModelProperty(value = "三保单据/技术状态鉴定单据id")
    private java.lang.String orderId;
    /**鉴定结论（技术状态）*/
    @Excel(name = "鉴定结论（技术状态）", width = 15)
    @ApiModelProperty(value = "鉴定结论（技术状态）")
    private java.lang.String technologyStatus;
    /**鉴定人签字*/
    @Excel(name = "鉴定人签字", width = 15)
    @ApiModelProperty(value = "鉴定人签字")
    private java.lang.String appraiser;
    /**领导签字*/
    @Excel(name = "领导签字", width = 15)
    @ApiModelProperty(value = "领导签字")
    private java.lang.String leadership;
    /**生产设备技术状态鉴定单据id*/
    @Excel(name = "生产设备技术状态鉴定单据id", width = 15)
    @ApiModelProperty(value = "生产设备技术状态鉴定单据id")
    private java.lang.String receipts;
    /**result_1*/
    @Excel(name = "result_1", width = 15)
    @ApiModelProperty(value = "result_1")
    private java.lang.String result_1;
    /**result_2*/
    @Excel(name = "result_2", width = 15)
    @ApiModelProperty(value = "result_2")
    private java.lang.String result_2;
    /**result_3*/
    @Excel(name = "result_3", width = 15)
    @ApiModelProperty(value = "result_3")
    private java.lang.String result_3;
    /**result_4*/
    @Excel(name = "result_4", width = 15)
    @ApiModelProperty(value = "result_4")
    private java.lang.String result_4;
    /**result_5*/
    @Excel(name = "result_5", width = 15)
    @ApiModelProperty(value = "result_5")
    private java.lang.String result_5;
    /**result_6*/
    @Excel(name = "result_6", width = 15)
    @ApiModelProperty(value = "result_6")
    private java.lang.String result_6;
    /**result_7*/
    @Excel(name = "result_7", width = 15)
    @ApiModelProperty(value = "result_7")
    private java.lang.String result_7;
    /**delFlag*/
    @Excel(name = "delFlag", width = 15)
    @ApiModelProperty(value = "delFlag")
    @TableLogic
    private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;

    @TableField(exist = false)
    private String flag;

    @TableField(exist = false)
    private String equipmentId;
}

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

@@ -20,4 +20,6 @@

    IPage<Map<String, Object>> getMaintenanceStandard2List(IPage<Map> pageData, @Param("params") Map<String,Object> params);

    IPage<Map<String, Object>> getMaintenanceStandard3List(IPage<Map> pageData, @Param("params") Map<String,Object> params);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/TechnologyStatusMapper.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.TechnologyStatus;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: mom_eam_technology_status
 * @Author: jeecg-boot
 * @Date:   2023-12-11
 * @Version: V1.0
 */
public interface TechnologyStatusMapper extends BaseMapper<TechnologyStatus> {

    List<Map<String, Object>> getTechnologyStatusList(@Param("orderId")String orderId);
}

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

@@ -8,6 +8,8 @@
            t1.num,
            t1.inspection_time as inspectionDate,
            t1.inspection_time as inspectionTime,
            DATEADD(DAY,+7,t1.inspection_time)   as redWarningTime,
            CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
            t1.inspection_deadline as inspectionDeadline,
            t1.start_work_condition as startWorkCondition,
            t1.status,

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

@@ -29,7 +29,56 @@
        left join sys_depart t4 on t2.use_id = t4.id
        left join mom_base_team t5 on t2.team_id = t5.id
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        where t1.del_flag = 0 and t1.type = #{params.type} and t2.use_id = #{params.useId}
        where t1.del_flag = 0 and t1.type = #{params.type}
        <if test="params.useId != null and params.useId != ''">
            and t2.use_id = #{params.useId}
        </if>
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>
        <if test="params.versionStatus != null and params.versionStatus != ''">
            and t1.version_status = #{params.versionStatus}
        </if>
        <if test="params.equipmentName != null and params.equipmentName != ''">
            and t2.name like concat('%',#{params.equipmentName},'%')
        </if>
        <if test="params.equipmentNum != null and params.equipmentNum != ''">
            and t2.num like concat('%',#{params.equipmentNum},'%')
        </if>
        ORDER BY t1.create_time desc
    </select>

    <select id="getMaintenanceStandard3List"  parameterType="Map" resultType="Map">
        SELECT
        t1.id,
        t1.num,
        t1.version,
        t1.depart_id as departId,
        t1.equipment_id AS equipmentId,
        t2.num AS equipmentNum,
        t2.NAME AS equipmentName,
        t2.model AS equipmentModel,
        t3.item_text as specificEquipment,
        t1.create_by AS createBy,
        t1.create_time AS createTime,
        t1.update_by AS updateBy,
        t1.update_time AS updateTime,
        t4.depart_name as useDepartName,
        t5.id as teamId,
        t5.name as teamName,
        t1.assign_mode as assignMode,
        t6.item_text as  assignModeName
        FROM
        mom_eam_maintenance_standard t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'specific_equipment' ) t3 ON t3.item_value = t2.specific_equipment
        left join sys_depart t4 on t2.use_id = t4.id
        left join mom_base_team t5 on t2.team_id = t5.id
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C')
        <if test="params.useId != null and params.useId != ''">
            and t2.use_id = #{params.useId}
        </if>
        <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/TechnologyStatusMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
<?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.TechnologyStatusMapper">

    <select id="getTechnologyStatusList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id AS id,
            t1.order_id AS orderId,
            t1.technology_status AS technologyStatus,
            t1.appraiser,
            t1.leadership,
            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,
            t1.receipts,
            t2.num AS receiptsNum,
            t3.item_text AS receiptsName,
            t1.update_time AS updateTime
        FROM
            mom_eam_technology_status t1
        LEFT JOIN sys_file_name t2 ON t1.receipts = t2.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name' ) t3 ON t3.item_value = t2.name
        where t1.del_flag = '0' and t1.order_id = #{orderId}
    </select>
</mapper>

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

@@ -17,4 +17,6 @@
    IPage<Map<String, Object>> getMaintenanceStandardList(Integer pageNo, Integer pageSize, Map<String, Object> params);

    IPage<Map<String, Object>> getMaintenanceStandard2List(Integer pageNo, Integer pageSize, Map<String, Object> params);

    IPage<Map<String, Object>> getMaintenanceStandard3List(Integer pageNo, Integer pageSize, Map<String, Object> params);
}

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

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

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

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

/**
 * @Description: mom_eam_technology_status
 * @Author: jeecg-boot
 * @Date:   2023-12-11
 * @Version: V1.0
 */
public interface ITechnologyStatusService extends IService<TechnologyStatus> {

    List<Map<String, Object>> getTechnologyStatusList(String orderId);
}

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

@@ -33,4 +33,10 @@
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.baseMapper.getMaintenanceStandard2List(pageData,params);
    }

    @Override
    public IPage<Map<String, Object>> getMaintenanceStandard3List(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.baseMapper.getMaintenanceStandard3List(pageData,params);
    }
}

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

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

import org.jeecg.modules.eam.entity.TechnologyStatus;
import org.jeecg.modules.eam.mapper.TechnologyStatusMapper;
import org.jeecg.modules.eam.service.ITechnologyStatusService;
import org.springframework.stereotype.Service;

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

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

/**
 * @Description: mom_eam_technology_status
 * @Author: jeecg-boot
 * @Date:   2023-12-11
 * @Version: V1.0
 */
@Service
public class TechnologyStatusServiceImpl extends ServiceImpl<TechnologyStatusMapper, TechnologyStatus> implements ITechnologyStatusService {

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