update

lius

2023-08-14 ce61b02c2889a1ebdc71ff048a7836bbf1fe3208

update

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

@@ -23,7 +23,7 @@
    List<MdcEquipmentDto> getMacingDataList(@Param("tableName") String tableName);

    @InterceptorIgnore(tenantLine = "1")
    @Select("select Sequencenumber,CollectTime from  ${tableName} " +
    @Select("select Sequencenumber,CollectTime from  [${tableName}] " +
            " where CollectTime > #{startTime} and CollectTime <= #{endTime} and Sequencenumber is not null" +
            "  order by CollectTime desc ")
    List<Map<String, Object>> getEquipmentSequenceNumber(@Param("tableName") String tableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);

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

@@ -36,8 +36,12 @@
    @Transactional(readOnly = true)
    public List<EquipmentMachingDto> getEquipmentSequencenumber(String drivetype, String equipmentid, Date startTime, Date endTime) {
        String tableName = drivetype + "_" + equipmentid;
        List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
        return convertData(list);
        try {
            List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
            return convertData(list);
        } catch (Exception e) {
            return null;
        }
    }

    private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {

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

@@ -59,15 +59,10 @@
                    Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, entity.getEquipmentId()));
                    if (equip != null) {
                        if (StringUtils.isNotBlank(equip.getDrivetype())) {
                            try {
                                List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime());
                                if (esList != null && esList.size() > 1) {
                                    dto.setSequenceNumber(esList.get(0).getSequencenumber());
                                }
                            } catch (Exception e) {
                                continue;
                            List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime());
                            if (esList != null && esList.size() > 1) {
                                dto.setSequenceNumber(esList.get(0).getSequencenumber());
                            }

                        }
                    }
                }