update

Lius

2025-03-03 c978d8b1de46a5a12f9d76b061815614fc4ac6ef

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java

@@ -146,6 +146,20 @@
    }

    /**
     * 通过id查询
     *
     * @param productionId
     * @return
     */
    @AutoLog(value = "大屏车间信息-通过ProductionId查询")
    @ApiOperation(value = "大屏车间信息-通过ProductionId查询", notes = "大屏车间信息-通过ProductionId查询")
    @GetMapping(value = "/queryByProductionId")
    public Result<?> queryByProductionId(@RequestParam(name = "productionId", required = true) String productionId) {
        MdcWorkshopInfo mdcWorkshopInfo = mdcWorkshopInfoService.getOne(new LambdaQueryWrapper<MdcWorkshopInfo>().eq(MdcWorkshopInfo::getProductionId, productionId));
        return Result.OK(mdcWorkshopInfo);
    }

    /**
     * 导出excel
     *
     * @param request
@@ -273,8 +287,8 @@
    @AutoLog(value = "大屏车间信息-大屏信息")
    @ApiOperation(value = "大屏车间信息-大屏信息", notes = "大屏车间信息-大屏信息")
    @GetMapping(value = "/getBigScreenInfo")
    public Result getBigScreenInfo(@RequestParam(name = "workshopId", required = true) String workshopId) {
        List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(workshopId);
    public Result getBigScreenInfo(@RequestParam(name = "productionId", required = true) String productionId) {
        List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(productionId);
        return Result.OK(result);
    }


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java

@@ -20,10 +20,10 @@
    /**
     * 大屏信息
     *
     * @param workshopId
     * @param productionId
     * @return
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("productionId") String productionId);

    /**
     * 大屏车间列表

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml

@@ -23,7 +23,7 @@
            INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
            INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
            AND a.CollectTime= b.maxgdtime
            AND mew.workshop_id = #{ workshopId }
            AND mew.production_id = #{ productionId }
    </select>

    <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java

@@ -19,7 +19,7 @@
    /**
     * 大屏信息
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(String productionId);

    /**
     * 车间大屏列表

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java

@@ -22,12 +22,12 @@

    /**
     * 大屏信息
     * @param workshopId
     * @param productionId
     * @return
     */
    @Override
    public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
        return this.baseMapper.getBigScreenInfo(workshopId);
    public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String productionId) {
        return this.baseMapper.getBigScreenInfo(productionId);
    }

    /**