Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -34,14 +34,15 @@

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

    @Override
    public Boolean isTableExist(String tableName) {
        Integer count = equipmentWorkLineMapper.isTableExist(tableName);
        return count != 0;
    }

    private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
@@ -63,7 +64,7 @@
            ei.setFeedrate(map.get("feedrate") == null ? null : map.get("feedrate").toString());
            ei.setFeedbeilv(map.get("feedbeilv") == null ? null : map.get("feedbeilv").toString());
            ei.setProgramnumber(map.get("Programnumber") == null ? null : map.get("Programnumber").toString());
            ei.setSequencenumber(map.get("SEQUENCENUMBER") == null ? null : map.get("SEQUENCENUMBER").toString());
            ei.setSequencenumber(map.get("Sequencenumber") == null ? null : map.get("Sequencenumber").toString());
            ei.setExecutingcode(map.get("executingcode") == null ? null : map.get("executingcode").toString());
            ei.setProductName(map.get("ProductName") == null ? null : map.get("ProductName").toString());
            dto.add(ei);